commit e66d2f44b07ce192a9261f8c41d1bfb0f4762c8e
author lora-sp <lora.spassova@swhk.ids-mannheim.de> Thu Mar 09 10:52:14 2023 +0100
committer lora-sp <lora.spassova@swhk.ids-mannheim.de> Thu Mar 09 10:52:14 2023 +0100
tree f977ca2e601a21bb4e8f3a1bc4441d527fc28417
parent de81daba706c97564b081d586fe6369b3ef7ff02

-

bunc2tei.py

diff --git a/bunc2tei.py b/bunc2tei.py
index 738eddb..a8dbe9d 100644
--- a/bunc2tei.py
+++ b/bunc2tei.py
@@ -136,12 +136,6 @@
 
 
 
-<<<<<<< HEAD
 ET.indent(tree, "  ")
 ET.register_namespace("", "http://www.tei-c.org/ns/1.0")
 tree.write("04_output.xml", encoding="utf-8", xml_declaration=True, method="xml", short_empty_elements=True)
-=======
-ET.indent(tree, '  ')
-ET.register_namespace('', 'http://www.tei-c.org/ns/1.0')
-tree.write('04_output.xml', encoding='utf-8', xml_declaration=True, method='xml', short_empty_elements=True)
->>>>>>> refs/remotes/origin/main