Finished resolving merge conflict

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
 });
 
 /***************