From 4e86586e7d98689cd6e0bed64dc3bc1b2b04a95c Mon Sep 17 00:00:00 2001 From: kikito Date: Wed, 26 Aug 2015 14:51:54 +0200 Subject: [PATCH] fixes error in db/schema.rb --- db/schema.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 8bb51ae70..783e3dbea 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -76,14 +76,10 @@ ActiveRecord::Schema.define(version: 20150826112411) do t.datetime "hidden_at" t.datetime "flagged_as_inappropiate_at" t.integer "inappropiate_flags_count", default: 0 -<<<<<<< HEAD - t.datetime "reviewed_at" t.integer "cached_votes_total", default: 0 t.integer "cached_votes_up", default: 0 t.integer "cached_votes_down", default: 0 -======= t.datetime "archived_at" ->>>>>>> master end add_index "debates", ["cached_votes_down"], name: "index_debates_on_cached_votes_down", using: :btree