diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:45:22 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:45:22 -0500 |
commit | 0c1299795a492e6296eb8e15bca576ea5139be6b (patch) | |
tree | 3921daf8c26d656b12b20ee22be63c97fa20f6fa /test/fixtures/tournament_user_pairs.yml | |
parent | 110d67f433c091a3b739c5bbebe110d963efaa73 (diff) | |
parent | fe7d5ad458b4cabd8fd57b47f81abc56dd8532ad (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
app/controllers/sessions_controller.rb
app/views/sessions/new.html.erb
Diffstat (limited to 'test/fixtures/tournament_user_pairs.yml')
-rw-r--r-- | test/fixtures/tournament_user_pairs.yml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/test/fixtures/tournament_user_pairs.yml b/test/fixtures/tournament_user_pairs.yml new file mode 100644 index 0000000..dbc4a88 --- /dev/null +++ b/test/fixtures/tournament_user_pairs.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + tournament_id: + user_id: + +two: + tournament_id: + user_id: |