diff options
| author | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 15:25:58 -0500 |
|---|---|---|
| committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 15:25:58 -0500 |
| commit | e4ae559d8189519586e044238196ee45b2a10c6b (patch) | |
| tree | 3d4977292aa234ea93ce604095f13d50484250a1 /test/fixtures/server_settings.yml | |
| parent | 2f450dd30bb210fdc4cb8899c72e6da945a163ba (diff) | |
| parent | da95cb4f0f48731c2713c61f17b522b048647fd1 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/views/layouts/application.html.erb
db/migrate/20140304043618_create_servers.rb
db/migrate/20140304043622_create_matches.rb
db/migrate/20140304043631_create_games.rb
Diffstat (limited to 'test/fixtures/server_settings.yml')
| -rw-r--r-- | test/fixtures/server_settings.yml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/test/fixtures/server_settings.yml b/test/fixtures/server_settings.yml new file mode 100644 index 0000000..937a0c0 --- /dev/null +++ b/test/fixtures/server_settings.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value |