Holy broken merge batman. Go home, you're drunk.

2013-06-25 00:31:01 -07:00 · 2013-06-25 00:31:01 -07:00 · ef89f5ae4b
parent f78f396940
commit ef89f5ae4b
1 changed files with 1 additions and 1 deletions
--- a/UI/app.js
+++ b/UI/app.js
@ -109,13 +109,13 @@ require.config({
            }
        },

+        'jquery.knob': {
            deps:
                [
                    '$'
                ]
        },

-        'jquery.knob': {
        'backbone.pageable': {
            deps:
                [