Skip to content

Commit 0e27208

Browse files
committed
Merge branch 'master' into production
2 parents 8c39288 + 4b7d852 commit 0e27208

File tree

4 files changed

+597
-544
lines changed

4 files changed

+597
-544
lines changed

karma.conf.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
var webdriverConfig = {
24
hostname: 'fe.nhnent.com',
35
port: 4444,
@@ -133,6 +135,7 @@ module.exports = function(config) {
133135
singleRun: true
134136
};
135137

138+
/* eslint-disable */
136139
setConfig(defaultConfig, process.env.KARMA_SERVER);
137140
config.set(defaultConfig);
138141
};

0 commit comments

Comments
 (0)