R11/release11-tools
4
2
Fork 0
Code Issues 9 Pull Requests 4 Packages Projects Releases 6 Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Adam Bem
2023-05-30 15:49:50 +02:00
parent e9221e2393
commit 5a331d9815
7 changed files with 0 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Frontend/tools/xmlFormatter.html
View File

@@ -5,14 +5,9 @@
<!-- <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>