solved merge conflicts

1 files changed, 15 insertions, 0 deletions

diff --git a/db/migrate/20140406171502_create_games.rb b/db/migrate/20140406171502_create_games.rb
new file mode 100644
index 0000000..5e4f56f
--- /dev/null
+++ b/db/migrate/20140406171502_create_games.rb
@@ -0,0 +1,15 @@
+class CreateGames < ActiveRecord::Migration
+  def change
+    create_table :games do |t|
+      t.text :name
+      t.integer :min_players_per_team
+      t.integer :max_players_per_team
+      t.integer :min_teams_per_match
+      t.integer :max_teams_per_match
+      t.integer :set_rounds
+      t.boolean :randomized_teams
+
+      t.timestamps
+    end
+  end
+end