From b5a34afe93c0646baebbab833fe099fc5c5bf4e2 Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Sun, 11 Aug 2024 22:11:55 +0200
Subject: [PATCH] chore - remove merge conflict markers

---
 versioning.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/versioning.js b/versioning.js
index 487a0c92..9a22c740 100644
--- a/versioning.js
+++ b/versioning.js
@@ -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>