From 7e38142d4aa080767617724a98c0cf60c70961d0 Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Thu, 10 Jul 2008 00:51:26 -0400 Subject: Resolve conflicts and convert _t( to _( where it was introduced again. darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz --- classes/Reply.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/Reply.php') diff --git a/classes/Reply.php b/classes/Reply.php index 507782391..af8f0b098 100644 --- a/classes/Reply.php +++ b/classes/Reply.php @@ -12,9 +12,9 @@ class Reply extends DB_DataObject public $__table = 'reply'; // table name public $notice_id; // int(4) primary_key not_null public $profile_id; // int(4) primary_key not_null - public $replied_id; // int(4) + public $replied_id; // int(4) public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP - public $replied_id; // int(4) + public $replied_id; // int(4) /* Static get */ function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Reply',$k,$v); } -- cgit v1.2.3-54-g00ecf