Skip to content
Snippets Groups Projects
Commit 0ef5141d authored by Rhys Evans's avatar Rhys Evans
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 68-as-a-user-i-would-like-to-see-a-map-containing-all-landmarks-for-a-trail-and-a-suggested-path

# Conflicts:
#	build.gradle
#	src/main/resources/data.sql
#	src/main/resources/schema.sql
#	src/test/java/Team5/SmartTowns/DataSourceConfig.java
#	src/test/resources/application.properties
parents 49e762e6 aa9507cc
No related branches found
No related tags found
1 merge request!40Resolve "As a user I would like to see a map containing all landmarks for a trail and a suggested path between them, so that I can easily follow the trail"
Hide whitespace changes
Inline Side-by-side
Showing
with 838 additions and 797 deletions
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