Merge conflicts and kill a whole lot of trailing whitespace on lines.

[quix0rs-gnu-social.git] / classes / Notice.php

diff --git a/classes/Notice.php b/classes/Notice.php
index a00114f95df2043db1a0258c7c009ceb629e6352..5a500a3aa72f20de2538e1ae581bdba209b034d8 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
  */
 require_once 'DB/DataObject.php';
 
-class Notice extends DB_DataObject 
+class Notice extends DB_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -34,7 +34,6 @@ class Notice extends DB_DataObject
     public $profile_id;                      // int(4)   not_null
     public $uri;                             // varchar(255)  unique_key
     public $content;                         // varchar(140)  
-    public $rendered;                        // text()  
     public $url;                             // varchar(255)  
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP