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/Token.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/Token.php')
| -rw-r--r-- | classes/Token.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/Token.php b/classes/Token.php index a91b19f8e..cd14fbfff 100644 --- a/classes/Token.php +++ b/classes/Token.php @@ -4,7 +4,7 @@ */ require_once 'DB/DataObject.php'; -class Token extends DB_DataObject +class Token extends DB_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -14,7 +14,7 @@ class Token extends DB_DataObject public $tok; // char(32) primary_key not_null public $secret; // char(32) not_null public $type; // tinyint(1) not_null - public $state; // tinyint(1) + public $state; // tinyint(1) public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP |