Merged changes

2016-06-04 01:18:20 -06:00 · 2016-06-04 01:18:20 -06:00 · 838cc29634
parent 23d8a6517f
commit 838cc29634
1 changed files with 4 additions and 0 deletions
--- a/cme/cmeserver.py
+++ b/cme/cmeserver.py
@ -1,9 +1,13 @@
 import BaseHTTPServer
 import threading
 import ssl
+<<<<<<< 23d8a6517fb1a36bac9b09e3923201ee291d00ac:cme/cmeserver.py
 import os
 import sys
 from getpass import getuser
+=======
+import sys
+>>>>>>> Added error handling for CME server in case the port is already in use.:core/cmeserver.py
 from BaseHTTPServer import BaseHTTPRequestHandler
 from logging import getLogger
 from gevent import sleep