CRM-13379 fix merge bug

diff --git a/templates/CRM/Contact/Form/Task/EmailCommon.js b/templates/CRM/Contact/Form/Task/EmailCommon.js
index acbb4c49d6b33437b63ba22da36efe874f5a7f81..1c4dfa0f0235645f8ad269591f1eae9cf09a6c4f 100644 (file)
--- a/templates/CRM/Contact/Form/Task/EmailCommon.js
+++ b/templates/CRM/Contact/Form/Task/EmailCommon.js
@@ -2,17 +2,4 @@ cj(function ($) {
   //do not copy & paste this - find a way to generalise it
   'use strict';
    $().crmAccordions();
-<<<<<<< HEAD
-  // NOTE: Might be safer to say $('[name=_qf_Email_upload]')
-   $('.form-submit').not('.cancel').on("click", function() {
-     $('.form-submit').not('.cancel').attr({value: ts('Processing')});
-     // CRM-13449 : setting a 0 ms timeout is needed 
-     // for some browsers like chrome. Used for purpose of
-     // submit the form and stop accidental multiple clicks
-     setTimeout(function(){
-       $('.form-submit').not('.cancel').attr({disabled: 'disabled'});
-     }, 0);
-   });
-=======
->>>>>>> CRM-13379 js, contribution form - generalise  button double submit protection and add to contribution.main to prevent double submits where people have no confirm page
 });