Fixing conflicts
Showing
- .vs/VSWorkspaceState.json 2 additions, 1 deletion.vs/VSWorkspaceState.json
- .vs/client-project-15-main/v16/.suo 0 additions, 0 deletions.vs/client-project-15-main/v16/.suo
- .vs/slnx.sqlite 0 additions, 0 deletions.vs/slnx.sqlite
- database.py 45 additions, 2 deletionsdatabase.py
- import_database.py 30 additions, 12 deletionsimport_database.py
- main.py 65 additions, 0 deletionsmain.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 104 additions, 4 deletionsstatic/style.css
- templates/Locations.html 30 additions, 0 deletionstemplates/Locations.html
- templates/about.html 6 additions, 0 deletionstemplates/about.html
- templates/add-workspace-result.html 7 additions, 0 deletionstemplates/add-workspace-result.html
- templates/add-workspace.html 57 additions, 0 deletionstemplates/add-workspace.html
Loading
Please register or sign in to comment