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

pull/4/head
Mark McDowall 12 years ago
parent f78f396940
commit ef89f5ae4b

@ -109,13 +109,13 @@ require.config({
}
},
'jquery.knob': {
deps:
[
'$'
]
},
'jquery.knob': {
'backbone.pageable': {
deps:
[

Loading…
Cancel
Save