Fix conflict

1 files changed, 10 insertions, 9 deletions

diff --git a/ui/css.js b/ui/css.js
index b7bc7d363..f6abb0d7a 100644
--- a/ui/css.js
+++ b/ui/css.js
@@ -1,25 +1,26 @@
 const fs = require('fs')
+const path = require('path')
 
 module.exports = bundleCss
 
 var cssFiles = {
-  'fonts.css': fs.readFileSync(__dirname+'/app/css/fonts.css', 'utf8'),
-  'reset.css': fs.readFileSync(__dirname+'/app/css/reset.css', 'utf8'),
-  'lib.css': fs.readFileSync(__dirname+'/app/css/lib.css', 'utf8'),
-  'index.css': fs.readFileSync(__dirname+'/app/css/index.css', 'utf8'),
-  'transitions.css': fs.readFileSync(__dirname+'/app/css/transitions.css', 'utf8'),
+  'fonts.css': fs.readFileSync(path.join(__dirname, '/app/css/fonts.css'), 'utf8'),
+  'reset.css': fs.readFileSync(path.join(__dirname, '/app/css/reset.css'), 'utf8'),
+  'lib.css': fs.readFileSync(path.join(__dirname, '/app/css/lib.css'), 'utf8'),
+  'index.css': fs.readFileSync(path.join(__dirname, '/app/css/index.css'), 'utf8'),
+  'transitions.css': fs.readFileSync(path.join(__dirname, '/app/css/transitions.css'), 'utf8'),
 }
 
-function bundleCss() {
-  var cssBundle = Object.keys(cssFiles).reduce(function(bundle, fileName){
+function bundleCss () {
+  var cssBundle = Object.keys(cssFiles).reduce(function (bundle, fileName) {
     var fileContent = cssFiles[fileName]
     var output = String()
 
-    output += '/*========== '+fileName+' ==========*/\n\n'
+    output += '/*========== ' + fileName + ' ==========*/\n\n'
     output += fileContent
     output += '\n\n'
 
-    return bundle+output
+    return bundle + output
   }, String())
 
   return cssBundle