Resolving conflict.

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():