diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 21:30:30 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 21:30:30 -0500 |
| commit | 5f8baf6334f427506193ea8efd1356812468e191 (patch) | |
| tree | 216b749f9d589739eefa69e02122ed60654a2d9b /app/models | |
| parent | 7bcd854443e368806cf1f4ece562c157db723d1a (diff) | |
| parent | c9f2abad7b9c967e23ed2b2867d426eb27f61387 (diff) | |
Merge branch 'clean'
Conflicts:
app/controllers/tournaments_controller.rb
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/team_match_pair.rb | 4 | ||||
| -rw-r--r-- | app/models/tournament_user_pair.rb | 4 | ||||
| -rw-r--r-- | app/models/user_team_pair.rb | 4 | ||||
| -rw-r--r-- | app/models/user_tournament_pair.rb | 4 |
4 files changed, 0 insertions, 16 deletions
diff --git a/app/models/team_match_pair.rb b/app/models/team_match_pair.rb deleted file mode 100644 index 85f8eaa..0000000 --- a/app/models/team_match_pair.rb +++ /dev/null @@ -1,4 +0,0 @@ -class TeamMatchPair < ActiveRecord::Base - belongs_to :team - belongs_to :match -end diff --git a/app/models/tournament_user_pair.rb b/app/models/tournament_user_pair.rb deleted file mode 100644 index eb4e9c5..0000000 --- a/app/models/tournament_user_pair.rb +++ /dev/null @@ -1,4 +0,0 @@ -class TournamentUserPair < ActiveRecord::Base - belongs_to :tournament - belongs_to :user -end diff --git a/app/models/user_team_pair.rb b/app/models/user_team_pair.rb deleted file mode 100644 index c55dc2e..0000000 --- a/app/models/user_team_pair.rb +++ /dev/null @@ -1,4 +0,0 @@ -class UserTeamPair < ActiveRecord::Base - belongs_to :user - belongs_to :team -end diff --git a/app/models/user_tournament_pair.rb b/app/models/user_tournament_pair.rb deleted file mode 100644 index b2676e5..0000000 --- a/app/models/user_tournament_pair.rb +++ /dev/null @@ -1,4 +0,0 @@ -class UserTournamentPair < ActiveRecord::Base - belongs_to :user - belongs_to :tournament -end |