Merge pull request #26 from zaphiro-technologies/fix-readme

Fix README.md
alliander-opensource · Oct 11, 2023 · 0a2bc00 · 0a2bc00
2 parents 7b3d449 + 5aa8162
commit 0a2bc00
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,6 @@ SPDX-License-Identifier: Apache-2.0
 
 # PyCGMES
 
-<<<<<<< HEAD
 - [PyCGMES](#pycgmes)
   - [About CGMES](#about-cgmes)
   - [Library usage](#library-usage)
@@ -27,7 +26,6 @@ SPDX-License-Identifier: Apache-2.0
     - [CI](#ci)
     - [CD](#cd)
   - [License](#license)
->>>>>>> 4384d02 (update docs with CGMES info)
 
 Python dataclasses for CGMES 3 + RDF schema description + SHACL (validation) files.