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

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

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