From 42ac7e8242e0e6fa51816449f4d73f5e80114b9a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Mar 2018 10:08:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend 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