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/Confirm_address.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'classes/Confirm_address.php') diff --git a/classes/Confirm_address.php b/classes/Confirm_address.php index d6d0d7796..7b2962925 100644 --- a/classes/Confirm_address.php +++ b/classes/Confirm_address.php @@ -4,7 +4,7 @@ */ require_once 'DB/DataObject.php'; -class Confirm_address extends DB_DataObject +class Confirm_address extends DB_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -15,8 +15,8 @@ class Confirm_address extends DB_DataObject public $address; // varchar(255) not_null public $address_extra; // varchar(255) not_null public $address_type; // varchar(8) not_null - public $claimed; // datetime() - public $sent; // datetime() + public $claimed; // datetime() + public $sent; // datetime() public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP /* Static get */ @@ -24,6 +24,6 @@ class Confirm_address extends DB_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - + function sequenceKey() { return array(false, false); } } -- cgit v1.2.3-54-g00ecf