Changeset 2ace8f0 for sources/app/src/main/java/parkup/configs/token
- Timestamp:
- 11/11/21 11:59:35 (3 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/configs/token/ConfirmationTokenService.java
r97fbc67 r2ace8f0 12 12 private final ConfirmationTokenRepositoryW confirmationTokenRepositoryW; 13 13 14 <<<<<<< HEAD 14 15 public ConfirmationTokenService(ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP, ConfirmationTokenRepositoryW confirmationTokenRepositoryW, parkup.configs.token.ConfirmationTokenRepositoryW confirmationTokenRepositoryW1) { 15 16 this.confirmationTokenRepositoryRP = confirmationTokenRepositoryRP; 16 17 this.confirmationTokenRepositoryW = confirmationTokenRepositoryW1; 18 ======= 19 public ConfirmationTokenService(ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP, ConfirmationTokenRepositoryW confirmationTokenRepositoryW) { 20 this.confirmationTokenRepositoryRP = confirmationTokenRepositoryRP; 21 this.confirmationTokenRepositoryW = confirmationTokenRepositoryW; 22 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 17 23 } 18 24
Note:
See TracChangeset
for help on using the changeset viewer.