resolving merge conflicts

1 files changed, 0 insertions, 17 deletions

diff --git a/app_expo/data/pythonserver.py b/app_expo/data/pythonserver.py
deleted file mode 100644
index 69fda3a..0000000
--- a/app_expo/data/pythonserver.py
+++ /dev/null
@@ -1,17 +0,0 @@
-try:
-     # Python 3
-     from http.server import HTTPServer, SimpleHTTPRequestHandler, test as test_orig
-     import sys
-     def test (*args):
-         test_orig(*args, port=int(sys.argv[1]) if len(sys.argv) > 1 else 8000)
-except ImportError: # Python 2
-     from BaseHTTPServer import HTTPServer, test
-     from SimpleHTTPServer import SimpleHTTPRequestHandler
-
-class CORSRequestHandler (SimpleHTTPRequestHandler):
-     def end_headers (self):
-         self.send_header('Access-Control-Allow-Origin', '*')
-         SimpleHTTPRequestHandler.end_headers(self)
-
-if __name__ == '__main__':
-     test(CORSRequestHandler, HTTPServer)