From 98cf96b3e4f642158a13d12d248170367332cce9 Mon Sep 17 00:00:00 2001
From: Mike Cochrane <mikec@mikenz.geek.nz>
Date: Thu, 10 Jul 2008 00:59:42 -0400
Subject: [PATCH] Resolve conflict properly

darcs-hash:20080710045942-533db-209fce2e2e89dfc809c9b25e93fb428c585f29e4.gz
---
 classes/Reply.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/classes/Reply.php b/classes/Reply.php
index af8f0b098c..2fb7a99f4a 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); }