From 690266c2c07e8be989a8e0964631301887dc6008 Mon Sep 17 00:00:00 2001
From: Geoff Kimball <geoff@zurb.com>
Date: Mon, 1 Feb 2016 16:16:37 -0800
Subject: [PATCH] Haphazardly prevent Babel errors from merge conflicts in
 slider.js

---
 js/foundation.slider.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/foundation.slider.js b/js/foundation.slider.js
index fb08fa480..868befd14 100644
--- 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){
-- 
2.47.2