Skip to content
Snippets Groups Projects
Commit 9ca6d9f7 authored by Liam Driscoll's avatar Liam Driscoll
Browse files

Resolving conflict.

parent 349b4e8c
No related branches found
No related tags found
3 merge requests!58Resolve "As a user I want to view a list of all locations available",!50ZAINABS work + my basic list locations page and route to help with this issue,!46form, templating, database connection and some CSS updates
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
project_server.py
+ 0
− 4
View file @ 9ca6d9f7
...@@ -28,8 +28,6 @@ def returnManageCoworkingSpaces(): ...@@ -28,8 +28,6 @@ def returnManageCoworkingSpaces():
if (request.method == 'GET'): if (request.method == 'GET'):
return render_template("Manage_Coworking_Spaces.html") return render_template("Manage_Coworking_Spaces.html")
<<<<<<< Updated upstream
=======
@app.route("/ListLocations", methods=['GET']) @app.route("/ListLocations", methods=['GET'])
def returnListLocations(): def returnListLocations():
if (request.method =='GET'): if (request.method =='GET'):
...@@ -72,8 +70,6 @@ def Load(): ...@@ -72,8 +70,6 @@ def Load():
return render_template('Space.html', data = data) 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 ) # 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']) @app.route("/SearchRecord", methods=['POST', 'GET'])
def searchRecord(): def searchRecord():
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment