Merge remote-tracking branch...
Merge remote-tracking branch 'origin/74-as-a-user-i-want-to-see-a-page-of-local-authorities-so-that-i-can-easily-source-contact-details' into businesses # Conflicts: # src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java # src/main/resources/WorkWith/local-authorities.html # src/main/resources/data.sql # src/main/resources/schema.sql # src/main/resources/templates/fragments/Templating.html
No related branches found
No related tags found
Showing
- src/main/java/Team5/SmartTowns/localauthority/localAuthority.java 58 additions, 0 deletions.../java/Team5/SmartTowns/localauthority/localAuthority.java
- src/main/java/Team5/SmartTowns/localauthority/localAuthorityRepository.java 9 additions, 0 deletions...5/SmartTowns/localauthority/localAuthorityRepository.java
- src/main/java/Team5/SmartTowns/localauthority/localAuthorityRepositoryJDBC.java 40 additions, 0 deletions...artTowns/localauthority/localAuthorityRepositoryJDBC.java
- src/main/resources/schema.sql 52 additions, 92 deletionssrc/main/resources/schema.sql
- src/main/resources/static/css/allTrails.css 120 additions, 120 deletionssrc/main/resources/static/css/allTrails.css
- src/main/resources/static/css/localAuthorityPageStyle.css 16 additions, 0 deletionssrc/main/resources/static/css/localAuthorityPageStyle.css
- src/main/resources/templates/local-auth-data.html 42 additions, 0 deletionssrc/main/resources/templates/local-auth-data.html
- src/main/resources/templates/local-authorities.html 20 additions, 0 deletionssrc/main/resources/templates/local-authorities.html
Loading
Please register or sign in to comment