Release 11.3

Frontend/tools/xmlFormatter.html

@@ -5,8 +5,14 @@
         <!-- <link rel="stylesheet" href="styles.css"> -->
         <link rel="stylesheet" href="../assets/css/tools/r11form.css">
         <link rel="stylesheet" href="../assets/css/highlight.css">
+<<<<<<< HEAD
         <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.7.0/highlight.min.js"></script>
         <script src="../assets/scripts/tools/scripts.js"></script>
+=======
+        <script src="../assets/scripts/common/hljs.min.js"></script>
+        <script src="../assets/scripts/tools/scripts.js"></script>
+        <script src="../assets/scripts/tools/xmlFormatter.js"></script>
+>>>>>>> master
         <script src="../assets/scripts/tools/highlight.js"></script>
         <script>hljs.highlightAll();</script>
 
@@ -62,6 +68,7 @@
 
         </div>
 
+<<<<<<< HEAD
         <script>
             function getProcessor() {
                 return "libxml";
@@ -76,6 +83,8 @@
             }
         </script>
 
+=======
+>>>>>>> master
     </body>
 
 </html>