diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
commit | 031b31dfcc2b99836021d6e251c78a9fc339d444 (patch) | |
tree | 4193ce7f3cd69f60a304e7d720baf943cf09da86 /app/models | |
parent | cd6b94cfc989800d65acc0fbceeebe35da5be4af (diff) | |
parent | 0f2b05889cba090e4824f62965ee8d131da09973 (diff) |
Settled Merge Conflicts.
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/remote_username.rb | 4 | ||||
-rw-r--r-- | app/models/server_setting.rb | 2 | ||||
-rw-r--r-- | app/models/server_settings.rb | 2 | ||||
-rw-r--r-- | app/models/tournament_option.rb | 3 | ||||
-rw-r--r-- | app/models/tournament_preference.rb | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/app/models/remote_username.rb b/app/models/remote_username.rb new file mode 100644 index 0000000..94e5063 --- /dev/null +++ b/app/models/remote_username.rb @@ -0,0 +1,4 @@ +class RemoteUsername < ActiveRecord::Base + belongs_to :game + belongs_to :user +end diff --git a/app/models/server_setting.rb b/app/models/server_setting.rb new file mode 100644 index 0000000..28ae943 --- /dev/null +++ b/app/models/server_setting.rb @@ -0,0 +1,2 @@ +class ServerSetting < ActiveRecord::Base +end diff --git a/app/models/server_settings.rb b/app/models/server_settings.rb deleted file mode 100644 index 7f49863..0000000 --- a/app/models/server_settings.rb +++ /dev/null @@ -1,2 +0,0 @@ -class ServerSettings < ActiveRecord::Base -end diff --git a/app/models/tournament_option.rb b/app/models/tournament_option.rb deleted file mode 100644 index 242a6f6..0000000 --- a/app/models/tournament_option.rb +++ /dev/null @@ -1,3 +0,0 @@ -class TournamentOption < ActiveRecord::Base - belongs_to :tournament -end diff --git a/app/models/tournament_preference.rb b/app/models/tournament_preference.rb new file mode 100644 index 0000000..1f335e3 --- /dev/null +++ b/app/models/tournament_preference.rb @@ -0,0 +1,3 @@ +class TournamentPreference < ActiveRecord::Base + belongs_to :tournament +end |