Pull conflicts

canopy-ros · Feb 6, 2016 · 98838d6 · 98838d6
1 parent 09228e5
commit 98838d6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/server/server_node.py b/src/server/server_node.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-import sys
+# import sys
 import ws
 import rospy
-from twisted.python import log
+# from twisted.python import log
 from twisted.internet import reactor
 from autobahn.twisted.websocket import WebSocketServerFactory
 
@@ -12,7 +12,7 @@
 
 
 def run_server(host, port):
-    log.startLogging(sys.stdout)
+    # log.startLogging(sys.stdout)
     url = "ws://{}:{}".format(host, port)
     factory = WebSocketServerFactory(url, debug=True)
     factory.protocol = ws.MMServerProtocol