Resolve conflicts

This commit is contained in:
Jiiks 2018-01-21 11:16:50 +02:00
parent 6816a2938a
commit e1e3e77e08
2 changed files with 2 additions and 1 deletions

View File

@ -5,4 +5,5 @@ export { Pluging } from './core/plugin';
export { BDIpc } from './core/bdipc';
export { WebpackModules } from './core/webpackmodules';
export { Events } from './core/events';
export { SocketProxy } from './core/discordsocket';
export { SocketProxy } from './core/discordsocket';
export { CssEditor } from './core/csseditor';