summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Cochrane <mikec@mikenz.geek.nz>2008-07-10 00:59:42 -0400
committerMike Cochrane <mikec@mikenz.geek.nz>2008-07-10 00:59:42 -0400
commit98cf96b3e4f642158a13d12d248170367332cce9 (patch)
tree4ace79ebdb07a7f86688c4847b727880535fc04f
parent7e38142d4aa080767617724a98c0cf60c70961d0 (diff)
Resolve conflict properly
darcs-hash:20080710045942-533db-209fce2e2e89dfc809c9b25e93fb428c585f29e4.gz
-rw-r--r--classes/Reply.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/classes/Reply.php b/classes/Reply.php
index af8f0b098..2fb7a99f4 100644
--- 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); }