diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-27 13:30:07 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-27 13:30:07 -0400 |
| commit | 8c1d3841142f06752cca7b521f420d2838928223 (patch) | |
| tree | 8281b59d3c241861bb610cb912cc4779bdc2d338 /db/schema.rb | |
| parent | eacf4fcc2a45142cd865795f35d65341dfe665ad (diff) | |
| parent | 9a8d6814511ce257241a03b5763430294ed3e381 (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/views/tournaments/_form.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/db/schema.rb b/db/schema.rb index 0616ef2..b3284b9 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: 20140427001542) do +ActiveRecord::Schema.define(version: 20140427171658) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -94,8 +94,6 @@ ActiveRecord::Schema.define(version: 20140427001542) do 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.string "sampling_method" t.string "scoring_method" t.datetime "created_at" @@ -272,8 +270,6 @@ ActiveRecord::Schema.define(version: 20140427001542) do 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.string "sampling_method" t.string "scoring_method" t.datetime "created_at" |