2014-11-13 10:18:07 +08:00
|
|
|
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
|
|
|
|
|
|
2015-01-10 17:27:08 +08:00
|
|
|
<<<<<<< HEAD
|
|
|
|
|
one:
|
|
|
|
|
name:
|
|
|
|
|
province: MyString
|
|
|
|
|
|
|
|
|
|
two:
|
|
|
|
|
name:
|
|
|
|
|
province: MyString
|
|
|
|
|
=======
|
2014-11-13 10:18:07 +08:00
|
|
|
school_117:
|
|
|
|
|
id: 117
|
|
|
|
|
name: 国防科学技术大学
|
|
|
|
|
province: 湖南省
|
|
|
|
|
logo_link:
|
|
|
|
|
|
|
|
|
|
school_001:
|
|
|
|
|
id: 1
|
|
|
|
|
name: 摧毁地球人学校
|
|
|
|
|
province: 火星
|
|
|
|
|
logo_link:
|
2015-01-10 17:27:08 +08:00
|
|
|
>>>>>>> a09a3dc378c45f43f5c4b090479fa292a846f4f0
|
