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

chore - remove merge conflict markers

Browse source
This commit is contained in:
Azgaar 2024-08-11 22:11:55 +02:00
parent 982f00328b
commit b5a34afe93
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
versioning.js
View file

@ -42,10 +42,6 @@ const version = "1.99.00"; // generator version, update each time
<li>North and South Poles temperature can be set independently</li>
<li>More than 70 new heraldic charges</li>
<li>Multi-color heraldic charges support</li>
<<<<<<< HEAD
=======
<li>New 3D scene options and improvements</li>
>>>>>>> 00abd5213b446922a60e2053eaca711a6d4067e2
</ul>
<p>Join our <a href="${discord}" target="_blank">Discord server</a> and <a href="${reddit}" target="_blank">Reddit community</a> to ask questions, share maps, discuss the Generator and Worlbuilding, report bugs and propose new features.</p>