From 1f850329b4a6c9bfd14b618a9d76ef802eea28ca Mon Sep 17 00:00:00 2001
From: Carlo Zancanaro <carlo@zancanaro.id.au>
Date: Mon, 29 Sep 2014 01:21:08 +1000
Subject: Lots of changes: now async, behaviour almost entirely managed by
 plugins

---
 karma.conf.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'karma.conf.js')

diff --git a/karma.conf.js b/karma.conf.js
index d8fc2e9..9dff1c9 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -49,24 +49,25 @@ module.exports = function(config) {
         autoWatch: true,
 
 
-        // Start these browsers, currently available:
-        // - Chrome
-        // - ChromeCanary
-        // - Firefox
-        // - Opera
-        // - Safari (only Mac)
-        // - PhantomJS
-        // - IE (only Windows)
-        browsers: ['PhantomJS'],
+        // Continuous Integration mode
+        // if true, it capture browsers, run tests and exit
+        singleRun: false,
+
+      // Start these browsers, currently available:
+      // - Chrome
+      // - ChromeCanary
+      // - Firefox
+      // - Opera
+      // - Safari (only Mac)
+      // - PhantomJS
+      // - IE (only Windows)
+      browsers: ['PhantomJS'],
 
 
         // If browser does not capture in given timeout [ms], kill it
         captureTimeout: 60000,
 
 
-        // Continuous Integration mode
-        // if true, it capture browsers, run tests and exit
-        singleRun: false
 
     });
 };
-- 
cgit v1.2.3