noosfero | Resolve missed code conflicts

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to refs/heads/master at <a href="https://gitlab.com/noosfero/noosfero">Noosfero / noosfero</a>

Commits:
<a href="https://gitlab.com/noosfero/noosfero/commit/cf1e8aa6e9ffb572f0dae9270da039157e6267ba">cf1e8aa6</a> by Braulio Bhavamitra
Resolve missed code conflicts

- - - - -


Changes:

=====================================
db/schema.rb
=====================================
--- 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"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150211/e2fd8721/attachment.html>