fixed conflicts with main

PeterStaar-IBM · PeterStaar-IBM · commit 8bf61cec8c4d · 2024-09-10T14:12:08.000+02:00
Signed-off-by: Peter Staar &lt;taa@zurich.ibm.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [v1.2.0](https://github.com/DS4SD/docling-core/releases/tag/v1.2.0) - 2024-09-10
+
+### Feature
+
+* Added the XML export ([#16](https://github.com/DS4SD/docling-core/issues/16)) ([`acdf816`](https://github.com/DS4SD/docling-core/commit/acdf81608134c23969c9e620085f4fff4f42a12f))
+
 ## [v1.1.4](https://github.com/DS4SD/docling-core/releases/tag/v1.1.4) - 2024-09-06
 
 ### Fix
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "docling-core"
-version = "1.1.4"
+version = "1.2.0"
 description = "A python library to define and validate data types in Docling."
 license = "MIT"
 authors = [
