1 files changed, 4 insertions, 0 deletions
diff --git a/usv_driver.py b/usv_driver.py
index bdf8656..4ff52ea 100755
--- a/usv_driver.py
+++ b/usv_driver.py
@@ -8,7 +8,11 @@ class Usv(object):
     def __init__(self, device, baudrate, json_file):
         self._serial_port = serial.Serial(device,
                 baudrate=baudrate,
+<<<<<<< HEAD
                 timeout=0.8)
+=======
+                timeout=10)
+>>>>>>> e3494d280fd6e2db591ea40c4365cdf18524fbdc
 
         # force a clean prompt
         #self._serial_port.write(b"\r")