From 9ca6d9f7734e0dbc4ce6e74fbd26f0f686b9c00e Mon Sep 17 00:00:00 2001
From: Liam Driscoll <driscolll4@cardiff.ac.uk>
Date: Fri, 9 Dec 2022 13:02:38 +0000
Subject: [PATCH] Resolving conflict.
---
project_server.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/project_server.py b/project_server.py
index 2ef2fd9..b1c6bb5 100644
--- a/project_server.py
+++ b/project_server.py
@@ -28,8 +28,6 @@ def returnManageCoworkingSpaces():
if (request.method == 'GET'):
return render_template("Manage_Coworking_Spaces.html")
-<<<<<<< Updated upstream
-=======
@app.route("/ListLocations", methods=['GET'])
def returnListLocations():
if (request.method =='GET'):
@@ -72,8 +70,6 @@ def Load():
return render_template('Space.html', data = data)
# pageAddress = Address, pageMain_Photo = Main_Photo, pageAdditional_photos = Additional_photos, pageDescription = Description, pageWebsite = Website, pageOpening_Hours = Opening_Hours )
-
->>>>>>> Stashed changes
@app.route("/SearchRecord", methods=['POST', 'GET'])
def searchRecord():
--
GitLab