summaryrefslogtreecommitdiff
path: root/karma-unit.conf.js
diff options
context:
space:
mode:
Diffstat (limited to 'karma-unit.conf.js')
-rw-r--r--karma-unit.conf.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/karma-unit.conf.js b/karma-unit.conf.js
index ae9e6ba..7afe2f0 100644
--- a/karma-unit.conf.js
+++ b/karma-unit.conf.js
@@ -40,8 +40,8 @@ module.exports = function (config) {
40 'bower_components/jquery/dist/jquery.min.js', 40 'bower_components/jquery/dist/jquery.min.js',
41 'bower_components/angular/angular.js', 41 'bower_components/angular/angular.js',
42 'bower_components/angular-mocks/angular-mocks.js', 42 'bower_components/angular-mocks/angular-mocks.js',
43 'merlin/static/merlin/js/libs/underscore/underscore-min.js', 43 'merlin/static/merlin/libs/underscore/underscore-min.js',
44 'merlin/static/merlin/js/libs/js-yaml/dist/js-yaml.min.js', 44 'merlin/static/merlin/libs/js-yaml/dist/js-yaml.min.js',
45 'merlin/static/merlin/js/custom-libs/barricade.js', 45 'merlin/static/merlin/js/custom-libs/barricade.js',
46 'merlin/static/merlin/js/custom-libs/ui-bootstrap-tpls-0.12.1.js', 46 'merlin/static/merlin/js/custom-libs/ui-bootstrap-tpls-0.12.1.js',
47 // explicitly require first module definition file to avoid errors 47 // explicitly require first module definition file to avoid errors