fixed merge conflicts
authorKurund Jalmi <kurund@yahoo.com>
Tue, 1 Sep 2015 23:53:25 +0000 (16:53 -0700)
committerKurund Jalmi <kurund@yahoo.com>
Tue, 1 Sep 2015 23:53:25 +0000 (16:53 -0700)
commitdb2e53c6f9a5c31b665c7de2f8416eaff945734c
treeca492f528a70e776e1d4404ee3fa86533d90bc4f
parentba99debe5f14718838a29e8e350e4c41177ddabb
parent44fd908483cc788a78f35d4d8a9e1cbdd7cac34d
fixed merge conflicts
31 files changed:
CRM/Activity/Form/Task/PickOption.php
CRM/Activity/Form/Task/PickProfile.php
CRM/Activity/Task.php
CRM/Case/Task.php
CRM/Contact/Form/Task/Merge.php
CRM/Contact/Form/Task/PickProfile.php
CRM/Contact/Task.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/Task/PickProfile.php
CRM/Contribute/Task.php
CRM/Event/Task.php
CRM/Grant/Task.php
CRM/Member/Form/Task/PickProfile.php
CRM/Member/Task.php
CRM/Pledge/Task.php
CRM/Utils/Hook.php
templates/CRM/Admin/Form/Setting/Mail.tpl
templates/CRM/Contact/Form/Domain.tpl
templates/CRM/Contact/Form/Search/Advanced.hlp
templates/CRM/Event/Form/ManageEvent/Registration.hlp
tests/phpunit/WebTest/ACL/AssignUsersToRolesTest.php
tests/phpunit/WebTest/Contact/AddContactsToEventAdvancedSearchTest.php
tests/phpunit/WebTest/Contact/AdvancedSearchedRelatedContactTest.php
tests/phpunit/WebTest/Contact/DeceasedContactsAdvancedSearchTest.php
tests/phpunit/WebTest/Contact/SearchTest.php
tests/phpunit/WebTest/Contact/TaskActionAddToGroupTest.php
tests/phpunit/WebTest/Contact/TaskActionSendMassMailing.php
tests/phpunit/WebTest/Contact/TaskActionSendSMS.php
tests/phpunit/WebTest/Event/ChangeParticipantStatus.php
tests/phpunit/WebTest/Export/ContactTest.php
tests/phpunit/WebTest/Profile/BatchUpdateTest.php