Resolve conflict properly

darcs-hash:20080710045942-533db-209fce2e2e89dfc809c9b25e93fb428c585f29e4.gz

diff --git a/classes/Reply.php b/classes/Reply.php
index af8f0b098c57f219e52c303c5df3b817b1260802..2fb7a99f4ae6bded6b2adb99b5596ae787650662 100644 (file)
--- a/classes/Reply.php
+++ b/classes/Reply.php
@@ -14,7 +14,6 @@ class Reply extends DB_DataObject
     public $profile_id;                      // int(4)  primary_key not_null
     public $replied_id;                      // int(4)
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
-    public $replied_id;                      // int(4)
 
     /* Static get */
     function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Reply',$k,$v); }