From cdd6446424801c08e525d47f00199391e188e9f4 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Thu, 17 Oct 2019 10:01:48 +0300
Subject: [PATCH] 1.1.17

---
 modules/ui/burgs-editor.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/ui/burgs-editor.js b/modules/ui/burgs-editor.js
index 6396f9e6..aa4230b1 100644
--- a/modules/ui/burgs-editor.js
+++ b/modules/ui/burgs-editor.js
@@ -397,12 +397,7 @@ function editBurgs() {
       data += b.walls ? "walls," : ",";
       data += b.plaza ? "plaza," : ",";
       data += b.temple ? "temple," : ",";
-<<<<<<< HEAD
       data += b.shanty ? "shanty town\n" : "\n";
-=======
-      data += b.shanty ? "shanty\n" : "\n";
-
->>>>>>> 40f4f308142aebc86427c252046d3d53df81b1cc
     });
 
     const name = getFileName("Burgs") + ".csv";