From 705f76fa3aa96bd14b8f543dac5762f8bd5aa560 Mon Sep 17 00:00:00 2001
From: Christoph Kluge <christoph.kluge@fau.de>
Date: Fri, 16 Sep 2022 10:12:37 +0200
Subject: [PATCH] Remove GitHub merge comment lines

---
 internal/api/docs.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/internal/api/docs.go b/internal/api/docs.go
index 4eecaa3..b606f2d 100644
--- a/internal/api/docs.go
+++ b/internal/api/docs.go
@@ -392,8 +392,6 @@ const docTemplate = `{
                 }
             }
         },
-<<<<<<< HEAD:internal/api/docs.go
-=======
         "api.TagJobApiRequest": {
             "description": "Request to tag a job.",
             "type": "array",
@@ -406,7 +404,11 @@ const docTemplate = `{
                     },
                     "status": {
                         "description": "Statustext of Errorcode",
->>>>>>> 922e94e835e2fba068341645df50e7b42734dfb5:docs/docs.go
+                        "type": "string"
+                    }
+                }
+            }
+        },              
         "schema.Job": {
             "type": "object",
             "properties": {