Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403874 )

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
......................................................................

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

Change-Id: Ia39284980bb927f4043dd88addfe71396473e42a
---
D phpunit.xml
1 file changed, 0 insertions(+), 59 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/74/403874/1

diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index 211d2a2..0000000
--- a/phpunit.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<<<<<<< HEAD   (354f32 Update CiviCRM submodule)
-=======
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd";
-    bootstrap="sites/default/bootstrap-phpunit.php">
-
-
-    <testsuites>
-      <testsuite name="large_donation tests">
-        <directory>sites/all/modules/large_donation/tests</directory>
-      </testsuite>
-      <testsuite name="offline2civicrm tests">
-        <directory>sites/all/modules/offline2civicrm/tests</directory>
-        
<exclude>sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php</exclude>
-      </testsuite>
-      <testsuite name="exchange_rates tests">
-        <directory>sites/all/modules/exchange_rates/tests/phpunit</directory>
-      </testsuite>
-      <testsuite name="metrics_reporting tests">
-        
<directory>sites/all/modules/metrics_reporting/tests/phpunit</directory>
-      </testsuite>
-      <testsuite name="orphan_slayer tests">
-        <directory>sites/all/modules/orphan_slayer/tests/phpunit</directory>
-      </testsuite>
-      <testsuite name="queue2civicrm tests">
-        <directory>sites/all/modules/queue2civicrm/tests/phpunit</directory>
-      </testsuite>
-      <testsuite name="recurring_globalcollect tests">
-        <directory>sites/all/modules/recurring_globalcollect/tests</directory>
-      </testsuite>
-      <testsuite name="thank_you tests">
-        <directory>sites/all/modules/thank_you/tests/phpunit</directory>
-      </testsuite>
-      <testsuite name="wmf_audit tests">
-        <directory>sites/all/modules/wmf_audit/tests</directory>
-      </testsuite>
-      <testsuite name="wmf_campaigns tests">
-        <directory>sites/all/modules/wmf_campaigns/tests</directory>
-      </testsuite>
-      <testsuite name="wmf_civicrm tests">
-        <directory>sites/all/modules/wmf_civicrm/tests/phpunit</directory>
-      </testsuite>
-      <testsuite name="wmf_common tests">
-        <directory>sites/all/modules/wmf_common/tests/phpunit</directory>
-      </testsuite>
-      <testsuite name="wmf_communication tests">
-        
<directory>sites/all/modules/wmf_communication/tests/phpunit</directory>
-        
<exclude>sites/all/modules/wmf_communication/tests/phpunit/CiviMailTestBase.php</exclude>
-      </testsuite>
-      <testsuite name="omnimail_tests">
-        
<directory>sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit</directory>
-      </testsuite>
-      <testsuite name="contacteditor_tests">
-        
<directory>sites/default/civicrm/extensions/org.wikimedia.contacteditor/tests/phpunit</directory>
-      </testsuite>
-    </testsuites>
-</phpunit>
->>>>>>> BRANCH (a8d515 Update CiviCRM submodule)

-- 
To view, visit https://gerrit.wikimedia.org/r/403874
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia39284980bb927f4043dd88addfe71396473e42a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to