From ef89f5ae4bf9511d91db74bfccdafb47175f163d Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Tue, 25 Jun 2013 00:31:01 -0700
Subject: [PATCH] Holy broken merge batman. Go home, you're drunk.

---
 UI/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UI/app.js b/UI/app.js
index 76b157b06..33f8aca6a 100644
--- a/UI/app.js
+++ b/UI/app.js
@@ -109,13 +109,13 @@ require.config({
             }
         },
 
+        'jquery.knob': {
             deps:
                 [
                     '$'
                 ]
         },
 
-        'jquery.knob': {
         'backbone.pageable': {
             deps:
                 [