From cf1e8aa6e9ffb572f0dae9270da039157e6267ba Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Tue, 10 Feb 2015 21:05:37 -0300 Subject: [PATCH] Resolve missed code conflicts --- db/schema.rb | 3 --- 1 file changed, 0 insertions(+), 3 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 8abf365..70543e6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -656,11 +656,8 @@ ActiveRecord::Schema.define(:version => 20150122165042) do t.boolean "pending", :default => false end -<<<<<<< HEAD add_index "tags", ["name"], :name => "index_tags_on_name", :unique => true -======= add_index "tags", ["parent_id"], :name => "index_tags_on_parent_id" ->>>>>>> Update schema.rb create_table "tasks", :force => true do |t| t.text "data" -- libgit2 0.21.2