From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
karma.conf.js | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/karma.conf.js b/karma.conf.js
index af139fa..795f946 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -28,6 +28,7 @@
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
- singleRun: false
+ singleRun: false,
+ browserNoActivityTimeout: 60000
});
};
--
Gitblit v1.8.0