mirror of
https://github.com/Azgaar/Fantasy-Map-Generator.git
synced 2025-12-21 19:41:23 +01:00
chore - remove merge conflict markers
This commit is contained in:
parent
6907c9dcac
commit
982f00328b
1 changed files with 0 additions and 3 deletions
|
|
@ -28,11 +28,8 @@ const version = "1.99.00"; // generator version, update each time
|
|||
|
||||
<ul>
|
||||
<strong>Latest changes:</strong>
|
||||
<<<<<<< HEAD
|
||||
<li>New routes generatation algorithm</li>
|
||||
=======
|
||||
<li>Configurable longitude</li>
|
||||
>>>>>>> 00abd5213b446922a60e2053eaca711a6d4067e2
|
||||
<li>Preview villages map</li>
|
||||
<li>Ability to render ocean heightmap</li>
|
||||
<li>Scale bar styling features</li>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue