Merge branch 'clean2'

Conflicts:
	app/models/game.rb

1 files changed, 3 insertions, 3 deletions

diff --git a/db/schema.rb b/db/schema.rb
index efe99b5..0e9202a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140424013300) do
+ActiveRecord::Schema.define(version: 20140424014459) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -81,15 +81,14 @@ ActiveRecord::Schema.define(version: 20140424013300) do
     t.text     "description"
     t.integer  "display_order"
     t.text     "default"
-    t.integer  "parent_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "game_settings", ["game_id"], name: "index_game_settings_on_game_id"
-  add_index "game_settings", ["parent_id"], name: "index_game_settings_on_parent_id"
 
   create_table "games", force: true do |t|
+    t.integer  "parent_id"
     t.string   "name"
     t.integer  "min_players_per_team"
     t.integer  "max_players_per_team"
@@ -103,6 +102,7 @@ ActiveRecord::Schema.define(version: 20140424013300) do
   end
 
   add_index "games", ["name"], name: "index_games_on_name", unique: true
+  add_index "games", ["parent_id"], name: "index_games_on_parent_id"
 
   create_table "hosts_tournaments", id: false, force: true do |t|
     t.integer "host_id",       null: false