Fix CHANGELOG.md #1471

OpenEnergyPlatform · Jun 25, 2024 · 4efd65c · 4efd65c
1 parent 590c491
commit 4efd65c
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -126,10 +126,7 @@ We added a lot of classes that are relevant for the OEKG development, i.e. techn
 - new module oeo-sectors (#1724)
 - mobility technology, electric mobility technology (#1727)
 - energy storage object hierarchy, energy storage technology hierarchy (#1728)
-<<<<<<< HEAD
-=======
-- German alternative labels (#1854, #1862)
->>>>>>> dev
+
 
 ### Changed
 - energy transformation (#1625)