Remove GitHub merge comment lines

2025-04-11 06:25:56 +02:00 · 2022-09-16 10:12:37 +02:00 · 2022-09-16 10:12:37 +02:00 · 705f76fa3a
commit 705f76fa3a
parent 597fe955fa
1 changed files with 5 additions and 3 deletions
--- 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": {