From fb2e8d7cafc0718b04122fdb66325ba492fbc331 Mon Sep 17 00:00:00 2001
From: Ko van der Sloot <Ko.vanderSloot@ziggo.nl>
Date: Thu, 5 Dec 2024 10:30:23 +0100
Subject: [PATCH] fix some merge problems

---
 src/foliatest.cxx  |  7 +++----
 src/text_tests.cxx | 12 ++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/foliatest.cxx b/src/foliatest.cxx
index f392b8e..5d80212 100644
--- a/src/foliatest.cxx
+++ b/src/foliatest.cxx
@@ -1070,10 +1070,9 @@ void correction_test009b(){
   FoliaElement *sent = new Sentence( args );
   nV.push_back(sent);
   Correction *c;
-// #if FOLIA_INT_VERSION >= 221
-//   assertThrow( c = node->correct( oV, cV, nV, sV, args ), DuplicateAttributeError );
-// #elif FOLIA_INT_VERSION >= 218
-#if FOLIA_INT_VERSION >= 218
+#if FOLIA_INT_VERSION >= 221
+  assertThrow( c = node->correct( oV, cV, nV, sV, args ), DuplicateAttributeError );
+#elif FOLIA_INT_VERSION >= 218
   assertThrow( c = node->correct( oV, cV, nV, sV, args ), XmlError );
 #else
   c = node->correct( oV, cV, nV, sV, args );
diff --git a/src/text_tests.cxx b/src/text_tests.cxx
index b7ddfd5..30bec6b 100644
--- a/src/text_tests.cxx
+++ b/src/text_tests.cxx
@@ -1141,15 +1141,15 @@ void text_test13f(){
 
   doc.setmode("strip");
   assertEqual( doc.getmode(), "mode=strip,checktext,autodeclare," );
-  //#if FOLIA_INT_VERSION < 221
+#if FOLIA_INT_VERSION < 221
   assertEqual( doc.xmlstring(),
 	       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 	       "<FoLiA xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns=\"http://ilk.uvt.nl/folia\" xml:id=\"example\" generator=\"\" version=\"\"><metadata type=\"native\"><annotations><text-annotation set=\"https://raw.githubusercontent.com/proycon/folia/master/setdefinitions/text.foliaset.ttl\"/></annotations></metadata><text xml:id=\"example.text.1\"><s xml:id=\"example.s.1\"><t>De site staat online . </t><w xml:id=\"example.s.1.w.1\"><t>De</t></w><w xml:id=\"example.s.1.w.2\"><t>site</t></w><w xml:id=\"example.s.1.w.3\"><t>staat</t></w><w xml:id=\"example.s.1.w.4\"><t>online</t></w><w xml:id=\"example.s.1.w.5\"><t>.</t></w></s></text></FoLiA>\n" );
-// #else
-//       assertEqual( doc.xmlstring(),
-// 	       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-// 	       "<FoLiA xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns=\"http://ilk.uvt.nl/folia\" xml:id=\"example\"><metadata type=\"native\"><annotations><text-annotation set=\"https://raw.githubusercontent.com/proycon/folia/master/setdefinitions/text.foliaset.ttl\"/></annotations></metadata><text xml:id=\"example.text.1\"><s xml:id=\"example.s.1\"><t>De site staat online . </t><w xml:id=\"example.s.1.w.1\"><t>De</t></w><w xml:id=\"example.s.1.w.2\"><t>site</t></w><w xml:id=\"example.s.1.w.3\"><t>staat</t></w><w xml:id=\"example.s.1.w.4\"><t>online</t></w><w xml:id=\"example.s.1.w.5\"><t>.</t></w></s></text></FoLiA>\n" );
-// #endif
+#else
+    assertEqual( doc.xmlstring(),
+		 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+		 "<FoLiA xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns=\"http://ilk.uvt.nl/folia\" xml:id=\"example\"><metadata type=\"native\"><annotations><text-annotation set=\"https://raw.githubusercontent.com/proycon/folia/master/setdefinitions/text.foliaset.ttl\"/></annotations></metadata><text xml:id=\"example.text.1\"><s xml:id=\"example.s.1\"><t>De site staat online . </t><w xml:id=\"example.s.1.w.1\"><t>De</t></w><w xml:id=\"example.s.1.w.2\"><t>site</t></w><w xml:id=\"example.s.1.w.3\"><t>staat</t></w><w xml:id=\"example.s.1.w.4\"><t>online</t></w><w xml:id=\"example.s.1.w.5\"><t>.</t></w></s></text></FoLiA>\n" );
+#endif
 }
 
 void text_test14(){