diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-27 13:30:07 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-27 13:30:07 -0400 |
| commit | 8c1d3841142f06752cca7b521f420d2838928223 (patch) | |
| tree | 8281b59d3c241861bb610cb912cc4779bdc2d338 /test/fixtures | |
| parent | eacf4fcc2a45142cd865795f35d65341dfe665ad (diff) | |
| parent | 9a8d6814511ce257241a03b5763430294ed3e381 (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')
| -rw-r--r-- | test/fixtures/games.yml | 4 | ||||
| -rw-r--r-- | test/fixtures/tournaments.yml | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/test/fixtures/games.yml b/test/fixtures/games.yml index ac5bad8..f6d8a2e 100644 --- a/test/fixtures/games.yml +++ b/test/fixtures/games.yml @@ -7,8 +7,6 @@ one: max_players_per_team: 1 min_teams_per_match: 1 max_teams_per_match: 1 - set_rounds: 1 - randomized_teams: false sampling_method: MyString scoring_method: MyString @@ -19,7 +17,5 @@ two: max_players_per_team: 1 min_teams_per_match: 1 max_teams_per_match: 1 - set_rounds: 1 - randomized_teams: false sampling_method: MyString scoring_method: MyString diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml index dd9b56d..d975b1d 100644 --- a/test/fixtures/tournaments.yml +++ b/test/fixtures/tournaments.yml @@ -8,8 +8,6 @@ one: max_players_per_team: 1 min_teams_per_match: 1 max_teams_per_match: 1 - set_rounds: 1 - randomized_teams: false sampling_method: MyString scoring_method: MyString @@ -21,7 +19,5 @@ two: max_players_per_team: 1 min_teams_per_match: 1 max_teams_per_match: 1 - set_rounds: 1 - randomized_teams: false sampling_method: MyString scoring_method: MyString |