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

This commit is contained in:
Mark McDowall committed 2013-06-25 00:31:01 -07:00
1 parent f78f396940
commit ef89f5ae4b
1 file changed
+1 -1
+1 -1
View File
@@ -109,13 +109,13 @@ require.config({
}
},
'jquery.knob': {
deps:
[
'$'
]
},
'jquery.knob': {
'backbone.pageable': {
deps:
[