diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-27 16:59:11 -0400 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-27 16:59:11 -0400 |
| commit | a683a208e31d5bafe7658521921f9f2c1a637418 (patch) | |
| tree | abf23ef14f584583973796b3da573c5061eb8533 /app/models | |
| parent | aeda550c2ad04c9496a803b1d7f1d34a4566a9fe (diff) | |
| parent | d8acc6785ee41a2628cd0d59d91916b2f087290b (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/views/tournaments/show.html.erb
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/game_option.rb | 2 | ||||
| -rw-r--r-- | app/models/game_setting.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/game_option.rb b/app/models/game_option.rb deleted file mode 100644 index bdc5560..0000000 --- a/app/models/game_option.rb +++ /dev/null @@ -1,2 +0,0 @@ -class GameOption < ActiveRecord::Base -end diff --git a/app/models/game_setting.rb b/app/models/game_setting.rb new file mode 100644 index 0000000..e147b15 --- /dev/null +++ b/app/models/game_setting.rb @@ -0,0 +1,3 @@ +class GameSetting < ActiveRecord::Base + belongs_to :game +end |