diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-04-23 21:34:10 -0400 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-04-23 21:34:10 -0400 |
| commit | 8010bd28db76dd5783b2be046de4c63fa27738f6 (patch) | |
| tree | 1f8ea8ff66dae3f5023804d131796ea6b6a666b1 /test | |
| parent | d90e7d47ed0900f2f8df62dba2e463752e0e3e81 (diff) | |
| parent | d1dbfb1dcd4810f538826fa5e448bdda0998b38e (diff) | |
Merge branch 'clean2'
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures/game_settings.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/fixtures/game_settings.yml b/test/fixtures/game_settings.yml index 118501b..37ec91d 100644 --- a/test/fixtures/game_settings.yml +++ b/test/fixtures/game_settings.yml @@ -8,6 +8,7 @@ one: description: MyText display_order: 1 default: MyText + parent_id: two: game_id: @@ -17,3 +18,4 @@ two: description: MyText display_order: 1 default: MyText + parent_id: |