From 4b656f47dff2bd6eed4dcfad060b8434d052d883 Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Wed, 9 Jul 2008 18:46:30 -0400 Subject: Merge conflicts and kill a whole lot of trailing whitespace on lines. darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz --- classes/Subscription.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes/Subscription.php') diff --git a/classes/Subscription.php b/classes/Subscription.php index 2a1037d2b..dd7b0f3db 100644 --- a/classes/Subscription.php +++ b/classes/Subscription.php @@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); } */ require_once 'DB/DataObject.php'; -class Subscription extends DB_DataObject +class Subscription extends DB_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -32,8 +32,8 @@ class Subscription extends DB_DataObject public $__table = 'subscription'; // table name public $subscriber; // int(4) primary_key not_null public $subscribed; // int(4) primary_key not_null - public $token; // varchar(255) - public $secret; // varchar(255) + public $token; // varchar(255) + public $secret; // varchar(255) public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP -- cgit v1.2.3-54-g00ecf