jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

<merge code from dev_dingxu> 

Signed-off-by: alan <547533434@qq.com>
This commit is contained in:
alan 2015-01-10 17:27:42 +08:00
parent a31088cc1b
commit d65239ef48
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/fixtures/activities.yml vendored
View File

@ -1,7 +1,7 @@
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
one: one:
<<<<<<< HEAD
act_id: act_id:
act_type: MyString act_type: MyString
user_id: user_id:
@ -10,7 +10,7 @@ two:
act_id: act_id:
act_type: MyString act_type: MyString
user_id: user_id:
=======
id: 1 id: 1
act_id: 1 act_id: 1
act_type: JournalsForMessage act_type: JournalsForMessage
@ -20,4 +20,4 @@ two:
act_id: 2 act_id: 2
act_type: JournalsForMessage act_type: JournalsForMessage
user_id: 5 user_id: 5
>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0