Fix rebase

[civicrm-core.git] / karma.conf.js

diff --git a/karma.conf.js b/karma.conf.js
index d1c9cd3487fd92e2c41ff3800a554f3e608a7bb0..1710c33fdc590a2ebc269766c99e930cde51ba5f 100644 (file)
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -21,6 +21,7 @@ module.exports = function(config) {
     autoWatch: true,
     browsers: ['PhantomJS'],
     exclude: [
+      'ang/api4Explorer/Explorer.js'
     ],
     files: [
       'bower_components/phantomjs-polyfill/bind-polyfill.js',
@@ -32,6 +33,7 @@ module.exports = function(config) {
       'bower_components/jquery-validation/dist/jquery.validate.min.js',
       'packages/jquery/plugins/jquery.timeentry.js',
       'js/Common.js',
+      'js/crm.datepicker.js',
       'bower_components/angular/angular.js',
       'js/crm.angular.js',
       angularTempFile,