Trying to fix merge conflicts
No related branches found
No related tags found
Showing
- .vs/ProjectSettings.json 3 additions, 0 deletions.vs/ProjectSettings.json
- .vs/VSWorkspaceState.json 7 additions, 0 deletions.vs/VSWorkspaceState.json
- .vs/client-project-15-main/v16/.suo 0 additions, 0 deletions.vs/client-project-15-main/v16/.suo
- .vs/client-project-15/v16/.suo 0 additions, 0 deletions.vs/client-project-15/v16/.suo
- database.py 45 additions, 2 deletionsdatabase.py
- image-asset.png 0 additions, 0 deletionsimage-asset.png
- import_database.py 30 additions, 12 deletionsimport_database.py
- main.py 65 additions, 1 deletionmain.py
- static/Location.css 35 additions, 0 deletionsstatic/Location.css
- static/fonts/CircularXX-Bold.woff 0 additions, 0 deletionsstatic/fonts/CircularXX-Bold.woff
- static/fonts/CircularXX-Bold.woff2 0 additions, 0 deletionsstatic/fonts/CircularXX-Bold.woff2
- static/fonts/CircularXX-Book.woff 0 additions, 0 deletionsstatic/fonts/CircularXX-Book.woff
- static/fonts/CircularXX-Book.woff2 0 additions, 0 deletionsstatic/fonts/CircularXX-Book.woff2
- static/fonts/CircularXX-Medium.woff 0 additions, 0 deletionsstatic/fonts/CircularXX-Medium.woff
- static/fonts/CircularXX-Medium.woff2 0 additions, 0 deletionsstatic/fonts/CircularXX-Medium.woff2
- static/scripts/Location.js 47 additions, 0 deletionsstatic/scripts/Location.js
- static/scripts/map.js 27 additions, 0 deletionsstatic/scripts/map.js
- static/style.css 114 additions, 4 deletionsstatic/style.css
- teamcb_720.jpg 0 additions, 0 deletionsteamcb_720.jpg
- templates/Locations.html 30 additions, 0 deletionstemplates/Locations.html
Loading
Please register or sign in to comment