ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-11-10 08:57:25 +01:00
Code Issues Packages Releases Activity

Remove GitHub merge comment lines

Browse Source
This commit is contained in:
Christoph Kluge 2022-09-16 10:12:37 +02:00
parent 597fe955fa
commit 705f76fa3a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/api/docs.go
View File

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