From 5d1b06a3cb78930aa5d0282e21756d41cfd2d41d Mon Sep 17 00:00:00 2001
From: iagirre <itziar.agirre@m2c.es>
Date: Wed, 24 Jan 2018 11:05:20 +0100
Subject: [PATCH] New and fresh DB schema

---
 db/schema.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 047909cb4..54794367d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1249,7 +1249,6 @@ ActiveRecord::Schema.define(version: 20180519132610) do
   add_index "votes", ["votable_id", "votable_type", "vote_scope"], name: "index_votes_on_votable_id_and_votable_type_and_vote_scope", using: :btree
   add_index "votes", ["voter_id", "voter_type", "vote_scope"], name: "index_votes_on_voter_id_and_voter_type_and_vote_scope", using: :btree
 
-<<<<<<< HEAD
   create_table "widget_cards", force: :cascade do |t|
     t.string   "title"
     t.text     "description"
@@ -1266,12 +1265,12 @@ ActiveRecord::Schema.define(version: 20180519132610) do
     t.integer  "limit",      default: 3
     t.datetime "created_at",             null: false
     t.datetime "updated_at",             null: false
-=======
+  end
+
   create_table "web_sections", force: :cascade do |t|
     t.text     "name"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
->>>>>>> Apply banner style to the new banners
   end
 
   add_foreign_key "administrators", "users"