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

2020-03-09 16:12:17 +01:00
parent 23cff2c3d3
commit 0a9922b8fe
4 changed files with 17 additions and 7 deletions
--- a/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java
+++ b/src/main/java/mops/gruppen2/controller/SwaggerAPIControllerExample.java
@ -53,7 +53,7 @@ public class SwaggerAPIControllerExample {
        return "Product saved successfully";
    }

-    /*@GetMapping("/json")       //just for testing
+    @GetMapping("/json")
    public void json() {
        AddUserEvent aEvent = new AddUserEvent(
                1,