Fixed merge conflicts
Showing
- src/main/java/Team5/SmartTowns/data/DatabaseController.java 2 additions, 3 deletionssrc/main/java/Team5/SmartTowns/data/DatabaseController.java
- src/main/java/Team5/SmartTowns/data/Location.java 12 additions, 9 deletionssrc/main/java/Team5/SmartTowns/data/Location.java
- src/main/java/Team5/SmartTowns/data/LocationRepository.java 6 additions, 7 deletionssrc/main/java/Team5/SmartTowns/data/LocationRepository.java
- src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java 21 additions, 28 deletions...in/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/data/Town.java 1 addition, 1 deletionsrc/main/java/Team5/SmartTowns/data/Town.java
- src/main/java/Team5/SmartTowns/data/TownRepository.java 1 addition, 1 deletionsrc/main/java/Team5/SmartTowns/data/TownRepository.java
- src/main/java/Team5/SmartTowns/data/TownRepositoryJDBC.java 1 addition, 1 deletionsrc/main/java/Team5/SmartTowns/data/TownRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/towns/TownController.java 4 additions, 4 deletionssrc/main/java/Team5/SmartTowns/towns/TownController.java
- src/test/java/CalculatorTest.java 2 additions, 4 deletionssrc/test/java/CalculatorTest.java
- src/test/java/Team5/SmartTowns/Data/LocationTest.java 0 additions, 7 deletionssrc/test/java/Team5/SmartTowns/Data/LocationTest.java
- src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java 53 additions, 53 deletions...est/java/Team5/SmartTowns/SmartTownsApplicationTests.java
- src/test/java/Team5/SmartTowns/Test5.java 1 addition, 1 deletionsrc/test/java/Team5/SmartTowns/Test5.java
- src/test/java/Team5/SmartTowns/data/LocationTest.java 5 additions, 0 deletionssrc/test/java/Team5/SmartTowns/data/LocationTest.java
- src/test/java/Team5/SmartTowns/data/locationRepositoryJDBCTest.java 0 additions, 0 deletions...ava/Team5/SmartTowns/data/locationRepositoryJDBCTest.java
Loading
Please register or sign in to comment