diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
| commit | f8e9b0349b82278c8fb015037e901dd5a77e30e7 (patch) | |
| tree | c54eae2919f7d6a8532527ec4db7b33c26b71a71 /db/schema.rb | |
| parent | 8abfaf4ce71dff7294424a7cb37efe4db5e0d581 (diff) | |
| parent | e08e007a6c50e1959a29a9d18dec8c52146a233c (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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/db/schema.rb b/db/schema.rb index b3284b9..a7910eb 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: 20140427171658) do +ActiveRecord::Schema.define(version: 20140428133136) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -94,7 +94,6 @@ ActiveRecord::Schema.define(version: 20140427171658) do t.integer "max_players_per_team" t.integer "min_teams_per_match" t.integer "max_teams_per_match" - t.string "sampling_method" t.string "scoring_method" t.datetime "created_at" t.datetime "updated_at" @@ -270,7 +269,6 @@ ActiveRecord::Schema.define(version: 20140427171658) do t.integer "max_players_per_team" t.integer "min_teams_per_match" t.integer "max_teams_per_match" - t.string "sampling_method" t.string "scoring_method" t.datetime "created_at" t.datetime "updated_at" |