From 6257df48b9c9de640eb3ff9b382d720cd7aa972f Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Thu, 17 Oct 2019 10:05:33 +0300
Subject: [PATCH] 1.1.18

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

diff --git a/modules/ui/burgs-editor.js b/modules/ui/burgs-editor.js
index aa4230b1..b33c5411 100644
--- a/modules/ui/burgs-editor.js
+++ b/modules/ui/burgs-editor.js
@@ -368,11 +368,7 @@ function editBurgs() {
   }
 
   function downloadBurgsData() {
-<<<<<<< HEAD
     let data = "Id,Burg,Province,State,Culture,Religion,Population,Longitude,Latitude,Elevation ("+heightUnit.value+"),Capital,Port,Citadel,Walls,Plaza,Temple,Shanty Town\n"; // headers
-=======
-    let data = "Id,Burg,Province,State,Culture,Religion,Population,Longitude,Latitude,Elevation ("+heightUnit.value+"),Capital,Port,Citadel,Walls,Plaza,Temple,Shanty\n"; // headers
->>>>>>> 40f4f308142aebc86427c252046d3d53df81b1cc
     const valid = pack.burgs.filter(b => b.i && !b.removed); // all valid burgs
 
     valid.forEach(b => {