Update requirejs to compatible version, remove r.js
Conflicts: package.json
Showing
build/r.js
deleted
100644 → 0
This diff is collapsed.
| ... | @@ -38,7 +38,7 @@ | ... | @@ -38,7 +38,7 @@ |
| "grunt-jsonlint": "~1.0.0", | "grunt-jsonlint": "~1.0.0", | ||
| "gzip-js": "0.3.2", | "gzip-js": "0.3.2", | ||
| "testswarm": "~1.1.0", | "testswarm": "~1.1.0", | ||
| "requirejs": "~2.1.8", | "requirejs": "~2.1.9", | ||
| "which": "~1.0.5" | "which": "~1.0.5" | ||
| }, | }, | ||
| "scripts": { | "scripts": { | ||
| ... | ... |
Please register or sign in to comment