From 4d58aa95f17d6fdfa8a625f4dc8ea80694c30c68 Mon Sep 17 00:00:00 2001 From: Larissa Reis Date: Tue, 24 Jun 2014 21:44:22 -0300 Subject: [PATCH] removes HEAD string left by accident --- test/unit/invite_member_test.rb | 1 - 1 file changed, 0 insertions(+), 1 deletion(-) diff --git a/test/unit/invite_member_test.rb b/test/unit/invite_member_test.rb index 95c864e..248c6e9 100644 --- a/test/unit/invite_member_test.rb +++ b/test/unit/invite_member_test.rb @@ -131,7 +131,6 @@ class InviteMemberTest < ActiveSupport::TestCase assert_match(/#{task.requestor.name} invited you to join #{community.name}/, email.subject) end -<<<<<<< HEAD should 'destroy InviteMember task when the community is destroyed' do p1 = create_user('testuser1').person p2 = create_user('testuser2').person -- libgit2 0.21.2