From 4338f188f0e33aa0359d473908be7700b14b6caf Mon Sep 17 00:00:00 2001
From: CodeSteak <codesteak@shellf.art>
Date: Tue, 5 May 2020 17:22:35 +0200
Subject: [PATCH] fix local merge conflicts in req ctrl

---
 .../main/java/org/hso/ecommerce/app/RequestController.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java
index 1e463fc..6ef7624 100644
--- a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java
@@ -98,7 +98,7 @@ public class RequestController {
         return "shop/search";
     }
 
-    @GetMapping("/shop/checkout")
+/*    @GetMapping("/shop/checkout")
     public String shopCheckout(HttpSession session, HttpServletRequest request) {
         session.setAttribute("afterLogin", request.getRequestURI());
         return "shop/checkout";
@@ -112,7 +112,7 @@ public class RequestController {
     @GetMapping("/shop/checkoutFinish")
     public String shopCheckoutFinishGET() {
         return "shop/checkoutFinish";
-    }
+    }*/
 
 //    @GetMapping("/shop/articles/{id}")
 //    public String shopArticlesById() {