doc: Fix CHANGELOG.md

ionos-cloud · Jan 13, 2025 · 3ba441a · 3ba441a
1 parent 8538966
commit 3ba441a
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,8 @@
 ## 6.6.9 -- upcoming release
 ### Features
-<<<<<<< HEAD
 - Add support for Monitoring Service: `ionoscloud_monitoring_pipeline` resource and data source.
-=======
 - Add `expose_serial` attribute for image data source
->>>>>>> 5a0f846c (feat: Add 'expose_serial' attribute for image DS)
+
 ### Docs
 - Replace < and > with " in the docs
 - Remove { and } from terraform imports