Merge remote-tracking branch 'origin/Api-Release' into Api-Release

# Conflicts: # Match-Api/src/main/java/com/example/matchapi/common/NicepayController.java
TEAMMatchDev · Oct 10, 2023 · cd75aee · cd75aee
2 parents 1a49388 + 13eb647
commit cd75aee
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Match-Api/src/main/java/com/example/matchapi/common/NicepayController.java b/Match-Api/src/main/java/com/example/matchapi/common/NicepayController.java
@@ -52,6 +52,7 @@ public String indexDemo(
         model.addAttribute("clientId", nicePayProperties.getClient());
         model.addAttribute("returnUrl",serverHost+"/serverAuth");
         return "index";
+        return "index";
     }
 
     @RequestMapping("/goPay")
@@ -87,4 +88,4 @@ public RedirectView requestPaymentAuth(
     }
 
      */
-}
+}