From 8cf2f47f5a8eba27600fb93429a4481839981067 Mon Sep 17 00:00:00 2001
From: jonobr1 <jonobrandel@gmail.com>
Date: Mon, 24 Jan 2011 14:09:16 -0800
Subject: [PATCH] merged slider changes

---
 controller.number.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/controller.number.js b/controller.number.js
index d63d490..12f0ad1 100644
--- a/controller.number.js
+++ b/controller.number.js
@@ -80,11 +80,7 @@ var NumberController = function() {
         } else if(isDragged) {
             if(inc != slider.value) inc = slider.value;
         }
-<<<<<<< HEAD
         updateValue(inc);
-=======
-        return false;
->>>>>>> b8323ce896a851bbe5a18e17bff36a5bdaa97db1
     }, false);
     
     function updateValue(val) {