From 60b58b47cecd7611ad8df2561a84bf0548ad6ad9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 20 Dec 2017 13:54:45 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend.git 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