From: Kosa <k@colonialone.fsf.org>
Date: Wed, 6 Jul 2016 19:34:21 +0000 (-0400)
Subject: resolving conflict in CRM/Member/Form/Membership.php for 4.6.19 upgrade
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6bcf954046e6a65b6dab2a13a0bffb446d8a403d;p=civicrm-core.git

resolving conflict in CRM/Member/Form/Membership.php for 4.6.19 upgrade
---

6bcf954046e6a65b6dab2a13a0bffb446d8a403d
diff --cc CRM/Member/Form/Membership.php
index d3b9e26d30,ae6a497325..7300dc112f
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@@ -1678,7 -1679,7 +1679,16 @@@ WHERE   id IN ( ' . implode(' , ', arra
          $endDate = CRM_Utils_Date::customFormat($endDate);
          $statusMsg .= ' ' . ts('The membership End Date is %1.', array(1 => $endDate));
        }
 -      if ($mailSend) {
++
++//<<<<<<< HEAD
 +      if (!empty($formValues['send_receipt']) && $receiptSend) {
++//=======
++//      if ($mailSend) {
++//>>>>>>> 867503d0ad00a9158feb7152efc1bc11b8a3924d
++
++
++
++
          $statusMsg .= ' ' . ts('A confirmation and receipt has been sent to %1.', array(1 => $this->_contributorEmail));
        }
      }