From 9725bbbf444d8eea38b848945795311e57e0deb2 Mon Sep 17 00:00:00 2001
From: deurstann <tristan.derouet@gmail.com>
Date: Fri, 19 Feb 2021 19:29:07 +0100
Subject: [PATCH] Finished resolving merge conflict
---
main.js | 8 --------
1 file changed, 8 deletions(-)
diff --git a/main.js b/main.js
index 6b23b6b..c87dab7 100644
--- a/main.js
+++ b/main.js
@@ -181,17 +181,9 @@ app.on('ready', () => {
setTimeout(() => {
lkt.statusActualisation();
}, 1500);
-<<<<<<< HEAD
setTimeout(() => {
lkt.commandPlaylistList();
}, 1500);
- lektor.on('close', code => {
- logger.warn('main', `Lektor exited with code ${code}`);
- lektor_closed = true;
- app.quit();
- });
-=======
->>>>>>> master
});
/***************
--
GitLab