Download as
Browse Code »

Commit cf1e8aa6e9ffb572f0dae9270da039157e6267ba

Authored by Braulio Bhavamitra
1 parent 984386a4
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Resolve missed code conflicts

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