fixed merge conflicts

2023-12-29 13:09:45 +01:00
parent c3eef96354
commit 48ff86d837
3 changed files with 0 additions and 13 deletions
--- a/Backend/tools-services/src/main/java/com/r11/tools/xml/Saxon.java
+++ b/Backend/tools-services/src/main/java/com/r11/tools/xml/Saxon.java
@@ -1,9 +1,6 @@
 package com.r11.tools.xml;

-<<<<<<< HEAD
-=======
 import com.r11.tools.model.XMLMultipleFilesData;
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 import com.r11.tools.model.XPathQueryResult;
 import net.sf.saxon.s9api.*;

@@ -106,11 +103,7 @@ public class Saxon implements XmlEngine{
    }

    /**
-<<<<<<< HEAD
-     * This method evaluates XQuery exporession on given xml
-=======
     * This method evaluates XQuery expression on given xml
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
     * @param data xml
     * @param xquery expression
     * @return
--- a/Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java
+++ b/Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java
@@ -1,9 +1,6 @@
 package com.r11.tools.xml;

-<<<<<<< HEAD
-=======
 import com.r11.tools.model.XMLMultipleFilesData;
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 import com.r11.tools.model.XPathQueryResult;
 import org.apache.xpath.XPathAPI;
 import org.w3c.dom.Document;
--- a/Backend/tools-services/src/main/java/com/r11/tools/xml/XmlEngine.java
+++ b/Backend/tools-services/src/main/java/com/r11/tools/xml/XmlEngine.java
@@ -1,9 +1,6 @@
 package com.r11.tools.xml;

-<<<<<<< HEAD
-=======
 import com.r11.tools.model.XMLMultipleFilesData;
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 import com.r11.tools.model.XPathQueryResult;

 public interface XmlEngine {