Commiting requried modifications to merge with main per git merge erro message
No related branches found
No related tags found
Showing
- build.gradle 3 additions, 2 deletionsbuild.gradle
- identifier.sqlite 0 additions, 0 deletionsidentifier.sqlite
- src/main/java/Team5.Smarttowns/Data/Towns.db 0 additions, 0 deletionssrc/main/java/Team5.Smarttowns/Data/Towns.db
- src/main/java/Team5/SmartTowns/Data/DatabaseController.java 40 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/DatabaseController.java
- src/main/java/Team5/SmartTowns/Data/UserRepository.java 8 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/UserRepository.java
- src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java 36 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/Data/location.java 12 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/location.java
- src/main/java/Team5/SmartTowns/Data/locationRepository.java 10 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/locationRepository.java
- src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java 29 additions, 0 deletions...in/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/Data/trail.java 12 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/trail.java
- src/main/java/Team5/SmartTowns/Data/trailsRepository.java 8 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/trailsRepository.java
- src/main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java 28 additions, 0 deletions...main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/Data/user.java 12 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/user.java
- src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java 24 additions, 9 deletionssrc/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
- src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java 1 addition, 1 deletion.../java/Team5/SmartTowns/Landmarks/LandmarksController.java
- src/main/java/Team5/SmartTowns/trailcontrollers/DragonsTale.java 0 additions, 15 deletions...n/java/Team5/SmartTowns/trailcontrollers/DragonsTale.java
- src/main/java/Team5/SmartTowns/trails/Trail.java 1 addition, 1 deletionsrc/main/java/Team5/SmartTowns/trails/Trail.java
- src/main/java/Team5/SmartTowns/trails/TrailsController.java 13 additions, 1 deletionsrc/main/java/Team5/SmartTowns/trails/TrailsController.java
- src/main/resources/QRCodeScanner.html 10 additions, 0 deletionssrc/main/resources/QRCodeScanner.html
- src/main/resources/application.properties 4 additions, 0 deletionssrc/main/resources/application.properties
identifier.sqlite
0 → 100644
src/main/java/Team5.Smarttowns/Data/Towns.db
0 → 100644
File added
src/main/resources/QRCodeScanner.html
0 → 100644
Please register or sign in to comment