Changeset 2ace8f0 for sources/app/src/main/java/parkup/configs

Timestamp:

11/11/21 11:59:35 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

8588fcb

Parents:

97fbc67 (diff), 9504a09 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/ParkUp

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
     }