Conflict resolve

This commit is contained in:
Jiiks 2018-01-21 11:12:29 +02:00
parent 0e70eea85c
commit 6816a2938a
1 changed files with 2 additions and 1 deletions

View File

@ -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();