diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-04-23 21:34:10 -0400 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-04-23 21:34:10 -0400 |
commit | 8010bd28db76dd5783b2be046de4c63fa27738f6 (patch) | |
tree | 1f8ea8ff66dae3f5023804d131796ea6b6a666b1 /app | |
parent | d90e7d47ed0900f2f8df62dba2e463752e0e3e81 (diff) | |
parent | d1dbfb1dcd4810f538826fa5e448bdda0998b38e (diff) |
Merge branch 'clean2'
Diffstat (limited to 'app')
-rw-r--r-- | app/models/game_setting.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/game_setting.rb b/app/models/game_setting.rb index bff8d97..e6d43e5 100644 --- a/app/models/game_setting.rb +++ b/app/models/game_setting.rb @@ -1,3 +1,4 @@ class GameSetting < ActiveRecord::Base belongs_to :game + belongs_to :parent end |