diff options
| author | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-09 18:46:30 -0400 |
|---|---|---|
| committer | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-09 18:46:30 -0400 |
| commit | 4b656f47dff2bd6eed4dcfad060b8434d052d883 (patch) | |
| tree | 6acc353a739f712ecbca9d825dcb7fa16f429ff1 /classes/Notice.php | |
| parent | 67921b1c1871e881f71f8f15aa7fc9c2b11da64d (diff) | |
Merge conflicts and kill a whole lot of trailing whitespace on lines.
darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz
Diffstat (limited to 'classes/Notice.php')
| -rw-r--r-- | classes/Notice.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index a00114f95..5a500a3aa 100644 --- 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 |