Browse Source

Fix conflict

pull/1443/head
Masayuki Tanaka 9 years ago
parent
commit
a14faa5243
  1. 2
      package.json

2
package.json

@ -33,7 +33,7 @@
"grunt-contrib-uglify": "~0.4.0", "grunt-contrib-uglify": "~0.4.0",
"grunt-contrib-watch": "^0.6.1", "grunt-contrib-watch": "^0.6.1",
"grunt-karma": "^0.12.1", "grunt-karma": "^0.12.1",
"grunt-sass": "^0.17.0", "grunt-sass": "^1.0.0",
"jasmine-core": "^2.3.4", "jasmine-core": "^2.3.4",
"karma": "^0.13.10", "karma": "^0.13.10",
"karma-coverage": "^0.5.2", "karma-coverage": "^0.5.2",

Loading…
Cancel
Save