resolved conflicts

2024-07-12 07:58:55 +08:00
parent c79ced4259 958f039a83
commit 00a9b807bd
14 changed files with 3 additions and 2 deletions
--- a/src/main/.DS_Store
+++ b/src/main/.DS_Store
--- a/src/main/java/.DS_Store
+++ b/src/main/java/.DS_Store
--- a/src/main/java/com/.DS_Store
+++ b/src/main/java/com/.DS_Store
--- a/src/main/java/com/safeqr/.DS_Store
+++ b/src/main/java/com/safeqr/.DS_Store
--- a/src/main/java/com/safeqr/app/.DS_Store
+++ b/src/main/java/com/safeqr/app/.DS_Store
--- a/src/main/java/com/safeqr/app/qrcode/.DS_Store
+++ b/src/main/java/com/safeqr/app/qrcode/.DS_Store
--- a/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java
+++ b/src/main/java/com/safeqr/app/qrcode/controller/QRCodeTypeController.java
@@ -61,4 +61,5 @@ public class QRCodeTypeController {
    public ResponseEntity<RedirectCountResponse> checkRedirects(@RequestBody QRCodePayload payload) {
        return ResponseEntity.ok(redirectCountService.countRedirects(payload).block());
    }
+
 }
--- a/src/main/java/com/safeqr/app/user/.DS_Store
+++ b/src/main/java/com/safeqr/app/user/.DS_Store
--- a/src/main/resources/.DS_Store
+++ b/src/main/resources/.DS_Store
--- a/src/main/resources/keystore/.DS_Store
+++ b/src/main/resources/keystore/.DS_Store