Fixed merge conflicts

This commit is contained in:
Leo Lamprecht 2018-04-16 07:17:17 -07:00
parent 4d7ce43755
commit 4ce99863c4
133 changed files with 74506 additions and 53064 deletions

View file

@ -1,5 +1,4 @@
export default class Client {
constructor() {
const electron = window.require('electron');
const EventEmitter = window.require('events');
@ -56,5 +55,4 @@ export default class Client {
this.removeAllListeners();
this.ipc.removeAllListeners();
}
}