Fix merge conflict
authoreileen <emcnaughton@wikimedia.org>
Thu, 27 Apr 2017 23:24:15 +0000 (11:24 +1200)
committereileen <emcnaughton@wikimedia.org>
Thu, 27 Apr 2017 23:24:15 +0000 (11:24 +1200)
commit877a7dbc01e8a97f9b9f4b6e2486da86719b8087
tree90963fdcde0e83d0d579935dcc379edf99130e6a
parent364e70deb4a1023002be3633c6176cb8851e7ac9
Fix merge conflict
tests/phpunit/CRM/Activity/BAO/ActivityTest.php