Skip to content

Commit 2c4fd59

Browse files
committed
Need to set ID fro websocket connection
1 parent 92d17f0 commit 2c4fd59

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

src/murfey/instrument_server/__init__.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ def run():
3737

3838
ws = murfey.client.websocket.WSApp(
3939
server=read_config()["Murfey"].get("server"),
40-
<<<<<<< HEAD
4140
id=0,
42-
=======
43-
>>>>>>> 64e4467 (Setup logging to graylog for instrument server via main server)
4441
)
4542

4643
handler = CustomHandler(ws.send)

0 commit comments

Comments
 (0)