From 07faa46af5af3777c17af6c75df9002933e34efa Mon Sep 17 00:00:00 2001
From: deurstann <tristan.derouet@gmail.com>
Date: Thu, 28 Jan 2021 19:37:08 +0100
Subject: [PATCH] Resolved unsaved changes
---
main.js | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/main.js b/main.js
index eb5711d..38e3bed 100644
--- a/main.js
+++ b/main.js
@@ -1,14 +1,3 @@
-<<<<<<< HEAD
-const logger = require.main.require('./common/logger.js');
-const electron = require('electron');
-const { app, BrowserWindow, ipcRenderer } = require('electron');
-const { globalShortcut } = require('electron');
-const { ipcMain } = require('electron');
-const { fork, spawn } = require('child_process');
-const fs = require('fs');
-const db = require.main.require('./common/db.js');
-const lkt = require.main.require('./common/lkt.js');
-=======
const logger = require.main.require('./common/logger.js'),
electron = require('electron'),
{ app, BrowserWindow, globalShortcut, ipcMain } = require('electron'),
@@ -16,7 +5,6 @@ const logger = require.main.require('./common/logger.js'),
fs = require('fs'),
db = require.main.require('./common/db.js'),
lkt = require.main.require('./common/lkt.js');
->>>>>>> origin/master
var tail = require('tail').Tail;
var client; /* Sub process for the express server */
var lektor; /* Sub process, the lektord player */
--
GitLab