Resolve conflicts and convert _t( to _( where it was introduced again.

[quix0rs-gnu-social.git] / classes / Reply.php

diff --git a/classes/Reply.php b/classes/Reply.php
index 507782391b7a06630e72fb7e95b4d11629fa6a27..af8f0b098c57f219e52c303c5df3b817b1260802 100644 (file)
--- 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); }