From 6816a2938a4585d1e32106fc0c1527eef5e217da Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Sun, 21 Jan 2018 11:12:29 +0200
Subject: [PATCH] Conflict resolve

---
 client/src/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/index.js b/client/src/index.js
index 04eaa77c..0322dce5 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -11,7 +11,7 @@
 'use strict';
 
 const styles = require('./styles/index.scss');
-const { Global, Logger, Utils, PluginManager, BDIpc, WebpackModules, SocketProxy, Events } = require('./modules');
+const { Global, Logger, Utils, PluginManager, BDIpc, WebpackModules, SocketProxy, Events, CssEditor } = require('./modules');
 //const { UI } = require('./modules/ui/index.jsx');
 
 class BetterDiscord {
@@ -19,6 +19,7 @@ class BetterDiscord {
     constructor() {
         window.bdUtils = Utils;
         window.wpm = WebpackModules;
+        window.cssEditor = CssEditor;
         Events.on('global-ready', e => {
             const { UI } = require('./modules/ui/vueui.js');
             this.ui = new UI();