GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Resolve conflict properly

Browse Source 
darcs-hash:20080710045942-533db-209fce2e2e89dfc809c9b25e93fb428c585f29e4.gz
This commit is contained in:
Mike Cochrane 2008-07-10 00:59:42 -04:00
parent 7e38142d4a
commit 98cf96b3e4
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
classes/Reply.php
View File

@ -14,7 +14,6 @@ class Reply extends DB_DataObject
public $profile_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 $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
public $replied_id; // int(4)
/* Static get */ /* Static get */
function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Reply',$k,$v); } function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Reply',$k,$v); }