Release 11.3

Frontend/tools/jsonFormatter.html

@@ -7,10 +7,16 @@
 
     <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/tools/highlight.js"></script>
     <script src="../assets/scripts/tools/json.js"></script>
+=======
+    <script src="../assets/scripts/common/hljs.min.js"></script>
+    <script src="../assets/scripts/tools/jsonFormatter.js"></script>
+    <script src="../assets/scripts/tools/highlight.js"></script>
+>>>>>>> master
     <script>hljs.highlightAll();</script>
   </head>
 
@@ -32,7 +38,7 @@
               <button class="action-button active" id="clearXMLButton" style="padding: 3px 10px;"
                       onclick="clearJsonData()">Clear</button>
               <button class="action-button active" id="defaultXMLButton" style="padding: 3px 10px;"
-                      onclick="insertDefaultJson()">Insert default XML</button>
+                      onclick="insertDefaultJson()">Insert default JSON</button>
             </div>
           </div>
           <pre>
@@ -61,6 +67,7 @@
       </div>
 
     </div>
+<<<<<<< HEAD
 
     <script>
       const mergeHTMLPlugin = (function () {
@@ -231,5 +238,7 @@
         
       }
     </script>
+=======
+>>>>>>> master
   </body>
 </html>