diff options
author | nfoy <nfoy@purdue.edu> | 2014-03-06 20:40:18 -0500 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-03-06 20:40:18 -0500 |
commit | a892016443d4845c1f738bcc57db82174c53701c (patch) | |
tree | f05cfe552d4b7c6793b172aa6b92906a0b2241fa /test/fixtures | |
parent | e10bf58ec059ec263c1d1a9dcac608475377868a (diff) | |
parent | 7bcd854443e368806cf1f4ece562c157db723d1a (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
config/routes.rb
Diffstat (limited to 'test/fixtures')
-rw-r--r-- | test/fixtures/user_tournament_pairs.yml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/test/fixtures/user_tournament_pairs.yml b/test/fixtures/user_tournament_pairs.yml new file mode 100644 index 0000000..974ee71 --- /dev/null +++ b/test/fixtures/user_tournament_pairs.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + user_id: + tournament_id: + +two: + user_id: + tournament_id: |