resolved merge conflicts
Showing
- .classpath 3 additions, 2 deletions.classpath
- .jhipster/Likes.json 2 additions, 2 deletions.jhipster/Likes.json
- .jhipster/UserWatchList.json 6 additions, 0 deletions.jhipster/UserWatchList.json
- .settings/org.eclipse.core.resources.prefs 3 additions, 3 deletions.settings/org.eclipse.core.resources.prefs
- .yo-rc.json 1 addition, 1 deletion.yo-rc.json
- Jenkinsfile 1 addition, 1 deletionJenkinsfile
- package-lock.json 395 additions, 401 deletionspackage-lock.json
- pom.xml 1 addition, 1 deletionpom.xml
- src/main/java/at/ac/uibk/gitsearch/GitsearchApp.java 2 additions, 1 deletionsrc/main/java/at/ac/uibk/gitsearch/GitsearchApp.java
- src/main/java/at/ac/uibk/gitsearch/config/SecurityConfiguration.java 2 additions, 0 deletions...va/at/ac/uibk/gitsearch/config/SecurityConfiguration.java
- src/main/java/at/ac/uibk/gitsearch/domain/Authority.java 9 additions, 0 deletionssrc/main/java/at/ac/uibk/gitsearch/domain/Authority.java
- src/main/java/at/ac/uibk/gitsearch/domain/Likes.java 9 additions, 9 deletionssrc/main/java/at/ac/uibk/gitsearch/domain/Likes.java
- src/main/java/at/ac/uibk/gitsearch/domain/SavedSearches.java 6 additions, 10 deletionssrc/main/java/at/ac/uibk/gitsearch/domain/SavedSearches.java
- src/main/java/at/ac/uibk/gitsearch/domain/Statistics.java 5 additions, 5 deletionssrc/main/java/at/ac/uibk/gitsearch/domain/Statistics.java
- src/main/java/at/ac/uibk/gitsearch/domain/User.java 24 additions, 0 deletionssrc/main/java/at/ac/uibk/gitsearch/domain/User.java
- src/main/java/at/ac/uibk/gitsearch/domain/UserWatchList.java 42 additions, 9 deletionssrc/main/java/at/ac/uibk/gitsearch/domain/UserWatchList.java
- src/main/java/at/ac/uibk/gitsearch/domain/enumeration/CheckFrequency.java 23 additions, 0 deletions.../ac/uibk/gitsearch/domain/enumeration/CheckFrequency.java
- src/main/java/at/ac/uibk/gitsearch/repository/AuthorityRepository.java 17 additions, 1 deletion.../at/ac/uibk/gitsearch/repository/AuthorityRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/LikesRepository.java 4 additions, 4 deletions...java/at/ac/uibk/gitsearch/repository/LikesRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/SavedSearchesRepository.java 2 additions, 2 deletions...ac/uibk/gitsearch/repository/SavedSearchesRepository.java
Please register or sign in to comment