Merge file

jojoee · Sep 27, 2016 · d66523b · d66523b
1 parent 968c080
commit d66523b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/public/src/js/blocker.js b/public/src/js/blocker.js
@@ -6,9 +6,7 @@ var config = require('./../../../common/config'),
   util = require('./blocker/util'),
   boot = require('./blocker/boot'),
   load = require('./blocker/load'),
-  play = (config.isOnline)
-    ? require('./blocker/play.online')
-    : require('./blocker/play.offline');
+  play = require('./blocker/play');
 
 module.exports = {
   Util: util,

diff --git a/public/src/js/blocker/play.offline.js → public/src/js/blocker/play.js b/public/src/js/blocker/play.offline.js → public/src/js/blocker/play.js
diff --git a/public/src/js/blocker/play.online.js b/public/src/js/blocker/play.online.js