Resolved merge conflict in xmlFormatter.html

2023-05-30 15:56:03 +02:00
parent 5a331d9815
commit 57a08c3246
1 changed files with 0 additions and 17 deletions
--- a/Frontend/tools/xmlFormatter.html
+++ b/Frontend/tools/xmlFormatter.html
@@ -63,23 +63,6 @@

        </div>

-<<<<<<< HEAD
-        <script>
-            function getProcessor() {
-                return "libxml";
-            }
-
-            function getVersion() {
-                return "1.0"
-            }
-
-            function init() {
-                configurePastingInElement("xmlArea");
-            }
-        </script>
-
-=======
->>>>>>> master
    </body>

 </html>