backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-18 18:11:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: resolve version conflict

Browse source
This commit is contained in:
Azgaar 2024-09-22 13:25:55 +02:00
parent dadb0cad8c
commit 1938cae91a
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
index.html
View file

@ -8126,9 +8126,6 @@
<script defer src="modules/io/save.js?v=1.100.00"></script> <script defer src="modules/io/save.js?v=1.100.00"></script>
<script defer src="modules/io/load.js?v=1.104.12"></script> <script defer src="modules/io/load.js?v=1.104.12"></script>
<script defer src="modules/io/cloud.js?v=1.99.00"></script> <script defer src="modules/io/cloud.js?v=1.99.00"></script>
<<<<<<< HEAD
<script defer src="modules/io/export.js?v=1.99.14"></script>
=======
<script defer src="modules/io/export.js?v=1.100.00"></script> <script defer src="modules/io/export.js?v=1.100.00"></script>
<script defer src="modules/renderers/draw-features.js?v=1.104.15"></script> <script defer src="modules/renderers/draw-features.js?v=1.104.15"></script>
@ -8142,6 +8139,5 @@
<script defer src="modules/renderers/draw-state-labels.js?v=1.104.0"></script> <script defer src="modules/renderers/draw-state-labels.js?v=1.104.0"></script>
<script defer src="modules/renderers/draw-burg-labels.js?v=1.104.0"></script> <script defer src="modules/renderers/draw-burg-labels.js?v=1.104.0"></script>
<script defer src="modules/renderers/draw-burg-icons.js?v=1.104.0"></script> <script defer src="modules/renderers/draw-burg-icons.js?v=1.104.0"></script>
>>>>>>> 97e504d2aaa3575761ffebbb10698bdbc831576b
</body> </body>
</html> </html>