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 /app/models/user_tournament_pair.rb | |
parent | e10bf58ec059ec263c1d1a9dcac608475377868a (diff) | |
parent | 7bcd854443e368806cf1f4ece562c157db723d1a (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
config/routes.rb
Diffstat (limited to 'app/models/user_tournament_pair.rb')
-rw-r--r-- | app/models/user_tournament_pair.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/user_tournament_pair.rb b/app/models/user_tournament_pair.rb new file mode 100644 index 0000000..b2676e5 --- /dev/null +++ b/app/models/user_tournament_pair.rb @@ -0,0 +1,4 @@ +class UserTournamentPair < ActiveRecord::Base + belongs_to :user + belongs_to :tournament +end |