Merge branch 'event-db' of /home/christoph/Documents/repos/abschlussprojekt-it-bois with conflicts.

2020-03-09 16:47:46 +01:00
parent b4719af264
commit a40ef0396d
3 changed files with 11 additions and 15 deletions
--- a/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java
+++ b/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java
@ -52,8 +52,8 @@ public class SwaggerAPIControllerExample {

        return "Product saved successfully";
    }
-/*
-    @GetMapping("/json")
+
+    /*@GetMapping("/json")
    public void json() {
        AddUserEvent aEvent = new AddUserEvent(
                1,