CHANGELOG: Removed git conflict marker

andygrunwald · andygrunwald · commit 4f9769924c5a · 2022-10-19T11:23:14.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -348,13 +348,10 @@ client.Project.GetAll(ctx, &GetQueryOptions{})
 ### Bug Fixes
 
 * README: Fixed all (broken) links
-<<<<<<< HEAD
-=======
 
 ### API-Endpoints
 
 * Workflow status categories: Revisited and fully implemented for Cloud and On Premise (incl. examples)
->>>>>>> ctreminiom-feature/552
 
 ### Other
 
