From c2a9e4ad5dfdd6c642f071f49914130b52ef5162 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Wed, 29 Dec 2021 22:15:04 +0300
Subject: [PATCH] supporters update

---
 modules/markers-generator.js | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/modules/markers-generator.js b/modules/markers-generator.js
index 5a5312f2..5999f965 100644
--- a/modules/markers-generator.js
+++ b/modules/markers-generator.js
@@ -126,23 +126,7 @@ window.Markers = (function () {
     return cells.p[cell];
   };
 
-<<<<<<< HEAD
   function addVolcanoes() {
-=======
-  function addMarker({cell, type, icon, dx, dy, px}) {
-    const i = last(pack.markers)?.i + 1 || 0;
-    const [x, y] = getMarkerCoordinates(cell);
-    const marker = {i, icon, type, x, y, cell};
-    if (dx) marker.dx = dx;
-    if (dy) marker.dy = dy;
-    if (px) marker.px = px;
-    pack.markers.push(marker);
-    occupied[cell] = true;
-    return "marker" + i;
-  }
-
-  function addVolcanoes(type, icon, multiplier) {
->>>>>>> c152c2ed (ensure marker id is unique)
     const {cells} = pack;
 
     let mountains = Array.from(cells.i.filter(i => cells.h[i] >= 70).sort((a, b) => cells.h[b] - cells.h[a]));