Haphazardly prevent Babel errors from merge conflicts in slider.js

diff --git a/js/foundation.slider.js b/js/foundation.slider.js
index fb08fa48022040f6fe9cbeb5af7c46563c0520fe..868befd14d1bcd666c063a5408bf837b5c811497 100644 (file)
--- a/js/foundation.slider.js
+++ b/js/foundation.slider.js
@@ -427,7 +427,7 @@
     if(this.options.clickSelect){
       this.$element.off('click.zf.slider').on('click.zf.slider', function(e){
         if(_this.$element.data('dragging')){ return false; }
-<<<<<<< HEAD
+// <<<<<<< HEAD
         _this.animComplete = false;
 
         if(!$(e.target).is('[data-slider-handle]')) {
@@ -436,15 +436,15 @@
           } else {
             _this._handleEvent(e, _this.$handle);
           }
-=======
+// =======
 
         if(_this.options.doubleSided){
           _this._handleEvent(e);
         }else{
           _this._handleEvent(e, _this.$handle);
->>>>>>> develop
+// >>>>>>> develop
         }
-      });
+      }});
     }
 
     if(this.options.draggable){