Merge "Renamed karma-unit.conf.js"

2016-05-23 12:38:01 +00:00 · 2016-05-23 12:38:01 +00:00 · 718f399ef9
commit 718f399ef9
parent 451539d34d 64eb327556
2 changed files with 1 additions and 1 deletions
--- a/karma-unit.conf.js
+++ b/karma-unit.conf.js
--- a/package.json
+++ b/package.json
@ -7,7 +7,7 @@
    "clean": "grunt clean",
    "lint": "eslint ./",
    "pretest-unit": "grunt build",
-    "test-unit": "karma start ./karma-unit.conf.js",
+    "test-unit": "karma start ./karma.conf.js",
    "test-functional": "grunt test:functional",
    "test-integration": "grunt test:integration",
    "draft": "grunt build:draft",