Commit 5899745a3cb7393d435625009e83fcb1b37c124b

Authored by Leandro Santos
1 parent 8cbb739a
Exists in fix_sign_up_form

remove merge conflit

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