Merge conflicts and kill a whole lot of trailing whitespace on lines.

darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz

1 files changed, 7 insertions, 7 deletions

diff --git a/classes/Profile.php b/classes/Profile.php
index 0cf1397c7..827339a60 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -24,19 +24,19 @@ if (!defined('LACONICA')) { exit(1); }
  */
 require_once 'DB/DataObject.php';
 
-class Profile extends DB_DataObject 
+class Profile extends DB_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'profile';                         // table name
     public $id;                              // int(4)  primary_key not_null
-    public $nickname;                        // varchar(64)  multiple_key not_null
-    public $fullname;                        // varchar(255)  multiple_key
+    public $nickname;                        // varchar(64)   not_null
+    public $fullname;                        // varchar(255)  
     public $profileurl;                      // varchar(255)  
-    public $homepage;                        // varchar(255)  multiple_key
-    public $bio;                             // varchar(140)  multiple_key
-    public $location;                        // varchar(255)  multiple_key
+    public $homepage;                        // varchar(255)  
+    public $bio;                             // varchar(140)  
+    public $location;                        // varchar(255)  
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
@@ -133,7 +133,7 @@ class Profile extends DB_DataObject
 		}
 		return true;
 	}
-	
+
 	function getBestName() {
 		return ($this->fullname) ? $this->fullname : $this->nickname;
 	}