summaryrefslogtreecommitdiff
path: root/classes/Remote_profile.php
diff options
context:
space:
mode:
authorMike Cochrane <mikec@mikenz.geek.nz>2008-07-09 18:46:30 -0400
committerMike Cochrane <mikec@mikenz.geek.nz>2008-07-09 18:46:30 -0400
commit4b656f47dff2bd6eed4dcfad060b8434d052d883 (patch)
tree6acc353a739f712ecbca9d825dcb7fa16f429ff1 /classes/Remote_profile.php
parent67921b1c1871e881f71f8f15aa7fc9c2b11da64d (diff)
Merge conflicts and kill a whole lot of trailing whitespace on lines.
darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz
Diffstat (limited to 'classes/Remote_profile.php')
-rw-r--r--classes/Remote_profile.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php
index e5613125d..216c989e7 100644
--- a/classes/Remote_profile.php
+++ b/classes/Remote_profile.php
@@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
*/
require_once 'DB/DataObject.php';
-class Remote_profile extends DB_DataObject
+class Remote_profile extends DB_DataObject
{
###START_AUTOCODE
/* the code below is auto generated do not remove the above tag */
@@ -32,8 +32,8 @@ class Remote_profile extends DB_DataObject
public $__table = 'remote_profile'; // table name
public $id; // int(4) primary_key not_null
public $uri; // varchar(255) unique_key
- public $postnoticeurl; // varchar(255)
- public $updateprofileurl; // varchar(255)
+ public $postnoticeurl; // varchar(255)
+ public $updateprofileurl; // varchar(255)
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP