diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
| commit | f8e9b0349b82278c8fb015037e901dd5a77e30e7 (patch) | |
| tree | c54eae2919f7d6a8532527ec4db7b33c26b71a71 /test/fixtures/games.yml | |
| parent | 8abfaf4ce71dff7294424a7cb37efe4db5e0d581 (diff) | |
| parent | e08e007a6c50e1959a29a9d18dec8c52146a233c (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/views/tournaments/_form.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
Diffstat (limited to 'test/fixtures/games.yml')
| -rw-r--r-- | test/fixtures/games.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/fixtures/games.yml b/test/fixtures/games.yml index f6d8a2e..bdb9cb5 100644 --- a/test/fixtures/games.yml +++ b/test/fixtures/games.yml @@ -7,7 +7,6 @@ one: max_players_per_team: 1 min_teams_per_match: 1 max_teams_per_match: 1 - sampling_method: MyString scoring_method: MyString two: @@ -17,5 +16,4 @@ two: max_players_per_team: 1 min_teams_per_match: 1 max_teams_per_match: 1 - sampling_method: MyString scoring_method: MyString |