From c3aad5823bd3d26d71a21942b92e314f80cde566 Mon Sep 17 00:00:00 2001
From: Lukas Bachschwell <lukas@lbsfilm.at>
Date: Wed, 16 Nov 2016 15:20:45 +0100
Subject: [PATCH] cleanup after bad merge

---
 package.json | 6 ------
 server.js    | 8 ++------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 0c421be..8cac3f6 100644
--- a/package.json
+++ b/package.json
@@ -7,14 +7,8 @@
     "async": "^2.0.0-rc.6",
     "emojize": "^0.2.0",
     "lowdb": "^0.12.5",
-<<<<<<< HEAD
     "serialport": "^4.0.5",
-    "socket.io": "^1.4.5"
-=======
-    "nan": "^2.3.5",
-    "serialport": "^2.0.6",
     "socket.io": "^1.4.8"
->>>>>>> 754c9a7bd9436bf6309b8a11822ff7b2e3014aee
   },
   "devDependencies": {},
   "scripts": {
diff --git a/server.js b/server.js
index e3b00a9..9d5ac61 100644
--- a/server.js
+++ b/server.js
@@ -147,12 +147,9 @@ function serialListener(debug)
 
     serialPort = new SerialPort(portName, {
         baudrate: 19200,
-<<<<<<< HEAD
-				parser: SerialPort.parsers.readline("\n")
+				parser: SerialPort.parsers.readline("\n"),
+				autoOpen: false //don't open imediatly
     });
-=======
-				parser: serialport.parsers.readline("\n")
-    },false); //don't open imedeatly
 
 		serialPort.open(function (err) {
   if (err) {
@@ -163,7 +160,6 @@ function serialListener(debug)
 				module.exports.demoMode  = 1;
 				return console.log('Error opening port: ', err.message,'###   ENABELED DEMOMODE under /demo !   ##############');
 			}
->>>>>>> 754c9a7bd9436bf6309b8a11822ff7b2e3014aee
 
       console.log('opened serial communication');