Download as
Browse Code »

Commit 4d58aa95f17d6fdfa8a625f4dc8ea80694c30c68

Authored by Larissa Reis
1 parent fad30e31
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

removes HEAD string left by accident

Showing 1 changed file with 0 additions and 1 deletions   Show diff stats
test/unit/invite_member_test.rb
  Diff comments   View file @4d58aa9
@@ -131,7 +131,6 @@ class InviteMemberTest < ActiveSupport::TestCase @@ -131,7 +131,6 @@ class InviteMemberTest < ActiveSupport::TestCase
131 assert_match(/#{task.requestor.name} invited you to join #{community.name}/, email.subject) 131 assert_match(/#{task.requestor.name} invited you to join #{community.name}/, email.subject)
132 end 132 end
133 133
134 -<<<<<<< HEAD  
135 should 'destroy InviteMember task when the community is destroyed' do 134 should 'destroy InviteMember task when the community is destroyed' do
136 p1 = create_user('testuser1').person 135 p1 = create_user('testuser1').person
137 p2 = create_user('testuser2').person 136 p2 = create_user('testuser2').person