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

diff --cc CRM/Contact/BAO/GroupContactCache.php
Simple merge

diff --cc CRM/Member/Form/Membership.php
index d3b9e26d30f6c8dd2ee60366e30846bc920c723f,ae6a497325ef8224dd08633afd5bf1f6b12db83e..7300dc112f391c205f288b09038afe747d5ead7c
--- 1/CRM/Member/Form/Membership.php
--- 2/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));
        }
      }