1 files changed, 0 insertions, 17 deletions
diff --git a/src/main.py b/src/main.py
index d6f420f..a65971d 100755
--- a/src/main.py
+++ b/src/main.py
@@ -31,23 +31,6 @@ async def mock_x_total_count_header(request: Request, call_next):
     response.headers["X-Total-Count"] = "100"
     return response
 
-<< << << < HEAD
-== == == =
-for i in range(10):
-    try:
-        db = DictDB()
-    except Exception:
-        print(
-            f'Database not responding, will try again soon. Attempt {i + 1} of 10.')
-    else:
-        break
-    time.sleep(1)
-else:
-    print('Database did not respond after 10 attempts, quitting.')
-    sys.exit(-1)
-
->>>>>> > main
-
 
 def get_pubkey():
     try: