Commit 3522d915b82c4cd7d0516ea79098b887414a89e7

Authored by Weblate
2 parents 4c4fae53 cf1e8aa6

Merge remote-tracking branch 'origin/master'

Showing 1 changed file with 0 additions and 3 deletions   Show diff stats
db/schema.rb
... ... @@ -656,11 +656,8 @@ ActiveRecord::Schema.define(:version => 20150122165042) do
656 656 t.boolean "pending", :default => false
657 657 end
658 658  
659   -<<<<<<< HEAD
660 659 add_index "tags", ["name"], :name => "index_tags_on_name", :unique => true
661   -=======
662 660 add_index "tags", ["parent_id"], :name => "index_tags_on_parent_id"
663   ->>>>>>> Update schema.rb
664 661  
665 662 create_table "tasks", :force => true do |t|
666 663 t.text "data"
... ...