Changeset 9ff45d6 for sources/app/src/main/java/parkup/configs/token

Timestamp:

12/24/21 23:31:23 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

9dd526f

Parents:

8588fcb

Message:

Fixed some functionalities related to parkingSessions and parkingZones

File:

• sources/app/src/main/java/parkup/configs/token/ConfirmationTokenService.java (modified) (1 diff)

sources/app/src/main/java/parkup/configs/token/ConfirmationTokenService.java

@@ -12 +12 @@
     private final ConfirmationTokenRepositoryW confirmationTokenRepositoryW;
 
-<<<<<<< HEAD
+
     public ConfirmationTokenService(ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP, ConfirmationTokenRepositoryW confirmationTokenRepositoryW, parkup.configs.token.ConfirmationTokenRepositoryW confirmationTokenRepositoryW1) {
         this.confirmationTokenRepositoryRP = confirmationTokenRepositoryRP;
         this.confirmationTokenRepositoryW = confirmationTokenRepositoryW1;
-=======
-    public ConfirmationTokenService(ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP, ConfirmationTokenRepositoryW confirmationTokenRepositoryW) {
-        this.confirmationTokenRepositoryRP = confirmationTokenRepositoryRP;
-        this.confirmationTokenRepositoryW = confirmationTokenRepositoryW;
->>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
     }
-
     public void saveConfirmationTokenRP(ConfirmationTokenRP token){
         confirmationTokenRepositoryRP.save(token);