fix: conflict (506bf4f1) · Commits · IF3110-2023-02-29 / SOAPService · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

SOAPService
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

IF3110-2023-02-29
SOAPService
Commits
506bf4f1

There was an error fetching the commit references. Please try again later.

Commit 506bf4f1 authored 1 year ago by

sozyGithub

Downloads
- Plain Diff

fix: conflict

parents 7da9a7c4 7131e796

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/soapService/Repository/AccountVerificationRequestRepository.java 12 additions, 3 deletions

...vice/Repository/AccountVerificationRequestRepository.java
src/main/java/org/soapService/Repository/BaseRepository.java 1 addition, 1 deletion

src/main/java/org/soapService/Repository/BaseRepository.java
src/main/java/org/soapService/Repository/CatalogReqeustRepository.java 2 additions, 2 deletions

.../org/soapService/Repository/CatalogReqeustRepository.java
src/main/java/org/soapService/Repository/LogRepository.java 1 addition, 1 deletion

src/main/java/org/soapService/Repository/LogRepository.java
src/main/java/org/soapService/Repository/ReportUserRepository.java 16 additions, 8 deletions

...java/org/soapService/Repository/ReportUserRepository.java
src/main/java/org/soapService/Services/AccountVerificationRequestServiceImpl.java 8 additions, 4 deletions

...rvice/Services/AccountVerificationRequestServiceImpl.java
src/main/java/org/soapService/Services/CatalogRequestServiceImpl.java 1 addition, 4 deletions

...a/org/soapService/Services/CatalogRequestServiceImpl.java
src/main/java/org/soapService/Services/ReportUserServiceImpl.java 2 additions, 8 deletions

.../java/org/soapService/Services/ReportUserServiceImpl.java

with 43 additions and 31 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment