diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 21:07:32 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 21:07:32 -0400 |
| commit | 1cca0b2c418d1c4a31a27c98d7b0951545303d2c (patch) | |
| tree | 889ae82c823c87c33438c9b3f40c67a5036698de /test/fixtures | |
| parent | 1627387966a4186a924bafd80cbd84c0861142b5 (diff) | |
| parent | b43bab15521c7c511ab7012bd137daa0e85bb95b (diff) | |
Merge branch 'clean2'
Conflicts:
config/routes.rb
db/schema.rb
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/game_settings.yml | 4 | ||||
| -rw-r--r-- | test/fixtures/remote_usernames.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/fixtures/game_settings.yml b/test/fixtures/game_settings.yml index 5626c97..7497d02 100644 --- a/test/fixtures/game_settings.yml +++ b/test/fixtures/game_settings.yml @@ -5,7 +5,7 @@ one: type: 1 name: MyString default: MyText - discription: MyText + description: MyText type_opt: MyText display_order: 1 @@ -14,6 +14,6 @@ two: type: 1 name: MyString default: MyText - discription: MyText + description: MyText type_opt: MyText display_order: 1 diff --git a/test/fixtures/remote_usernames.yml b/test/fixtures/remote_usernames.yml index 0b3055a..baa1714 100644 --- a/test/fixtures/remote_usernames.yml +++ b/test/fixtures/remote_usernames.yml @@ -3,9 +3,9 @@ one: game_id: user_id: - user_name: MyString + json_value: MyText two: game_id: user_id: - user_name: MyString + json_value: MyText |