diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-29 03:49:54 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-29 03:49:54 -0400 |
| commit | 4f523f424cb41733c19754c5d4b538053d86ab74 (patch) | |
| tree | 55736af3a1ffe6494eb978be17f348b7e899630f /test/fixtures/matches.yml | |
| parent | a3a72a54cc5742ffe82611fb87b3445c251d0676 (diff) | |
| parent | 4c5c8b978d6bc70811e95e6da5afd06ec7a2e27e (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/matches_controller.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'test/fixtures/matches.yml')
| -rw-r--r-- | test/fixtures/matches.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/test/fixtures/matches.yml b/test/fixtures/matches.yml index 4213238..2a995c7 100644 --- a/test/fixtures/matches.yml +++ b/test/fixtures/matches.yml @@ -4,12 +4,8 @@ one: status: 1 tournament_stage_id: winner_id: - remote_id: MyText - submitted_peer_evaluations: 1 two: status: 1 tournament_stage_id: winner_id: - remote_id: MyText - submitted_peer_evaluations: 1 |