remove merge conflit

Leandro Santos
1 parent 8cbb739a
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
test/unit/person_test.rb
@@ -1958,7 +1958,6 @@ class PersonTest &lt; ActiveSupport::TestCase
     person.save!
   end
  
-<<<<<<< HEAD
   should 'update profile circles for a person' do
     person = create_user('testuser').person
     community = fast_create(Community)
@@ -2023,4 +2022,5 @@ class PersonTest &lt; ActiveSupport::TestCase
     person.environment.add_admin(person)
     assert_equivalent [task4, task2, task1], person.all_pending_tasks
   end
+
 end
...	...	@@ -1958,7 +1958,6 @@ class PersonTest < ActiveSupport::TestCase
1958	1958	person.save!
1959	1959	end
1960	1960
1961		-<<<<<<< HEAD
1962	1961	should 'update profile circles for a person' do
1963	1962	person = create_user('testuser').person
1964	1963	community = fast_create(Community)
...	...	@@ -2023,4 +2022,5 @@ class PersonTest < ActiveSupport::TestCase
2023	2022	person.environment.add_admin(person)
2024	2023	assert_equivalent [task4, task2, task1], person.all_pending_tasks
2025	2024	end
	2025	+
2026	2026	end
...	...