diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-29 03:49:54 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-29 03:49:54 -0400 |
| commit | 4f523f424cb41733c19754c5d4b538053d86ab74 (patch) | |
| tree | 55736af3a1ffe6494eb978be17f348b7e899630f /db/schema.rb | |
| parent | a3a72a54cc5742ffe82611fb87b3445c251d0676 (diff) | |
| parent | 4c5c8b978d6bc70811e95e6da5afd06ec7a2e27e (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/matches_controller.rb
app/views/matches/index.html.erb
app/views/matches/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 c5032fa..1186a7f 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: 20140428223939) do +ActiveRecord::Schema.define(version: 20140429074555) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -111,8 +111,6 @@ ActiveRecord::Schema.define(version: 20140428223939) do t.integer "status" t.integer "tournament_stage_id" t.integer "winner_id" - t.text "remote_id" - t.integer "submitted_peer_evaluations" t.datetime "created_at" t.datetime "updated_at" end |