Fixing location html + adding to database workspaces

database.sqbpro

+<?xml version="1.0" encoding="UTF-8"?><sqlb_project><db path="C:/Users/c21054715/OneDrive - Cardiff University/Documents/Client Project 2021/client-project-15/database.db" readonly="0" foreign_keys="1" case_sensitive_like="0" temp_store="0" wal_autocheckpoint="1000" synchronous="2"/><attached/><window><main_tabs open="structure browser pragmas query" current="1"/></window><tab_structure><column_width id="0" width="300"/><column_width id="1" width="0"/><column_width id="2" width="150"/><column_width id="3" width="2792"/><column_width id="4" width="0"/><expanded_item id="0" parent="1"/><expanded_item id="1" parent="1"/><expanded_item id="2" parent="1"/><expanded_item id="3" parent="1"/></tab_structure><tab_browse><current_table name="4,10:mainWorkspaces"/><default_encoding codec=""/><browse_table_settings><table schema="main" name="AdditionalPhotos" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk="_rowid_"><sort/><column_widths><column index="1" value="61"/><column index="2" value="300"/><column index="3" value="153"/></column_widths><filter_values/><conditional_formats/><row_id_formats/><display_formats/><hidden_columns/><plot_y_axes/><global_filter/></table><table schema="main" name="Workspaces" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk="_rowid_"><sort/><column_widths><column index="1" value="61"/><column index="2" value="95"/><column index="3" value="300"/><column index="4" value="300"/><column index="5" value="300"/><column index="6" value="299"/><column index="7" value="264"/><column index="8" value="172"/><column index="9" value="258"/><column index="10" value="300"/></column_widths><filter_values/><conditional_formats/><row_id_formats/><display_formats/><hidden_columns/><plot_y_axes/><global_filter/></table></browse_table_settings></tab_browse><tab_sql><sql name="SQL 1"></sql><current_tab id="0"/></tab_sql></sqlb_project>

templates/Locations.html

@@ -7,11 +7,7 @@
   <button class="btn" onclick="filterSelection('North-England')"> North England</button>
   <button class="btn" onclick="filterSelection('South-West-England')"> South West England</button>
   <button class="btn" onclick="filterSelection('Midlands')"> Midlands</button>
-<<<<<<< HEAD
   <button class="btn" onclick="filterSelection('Scotland')"> Scotland</button>
-=======
-  <button class="btn" onclick="filterSelection('Scotland')"> Scotland<button>
->>>>>>> eee8f2dbda7bb480a8543f73de8f7278a1aed2e0
 </div>
 
 <div class="container">
@@ -28,3 +24,4 @@
   <div class="filterDiv Scotland">Location 11</div>
   <div class="filterDiv Scotland">Location 12</div>
 </div>
+{% endblock %}