From 3b862b53ebe451d1b47ea807f511717d15c89a5a Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 1 Feb 2018 00:41:27 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=EB=B3=91=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tmp_map/map.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/tmp_map/map.js b/tmp_map/map.js
index 55fe8585..93bca7f3 100644
--- a/tmp_map/map.js
+++ b/tmp_map/map.js
@@ -460,18 +460,3 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback, hrefTemplate)
         .then(saveCityInfo);    
 }
 
-<<<<<<< HEAD
-$(function(){
-
-    var isDetailMap = true;
-    var clickableAll = false;
-
-    function tmp(a){
-        console.log(a.name);
-        return false;
-    }
-    reloadWorldMap(isDetailMap, clickableAll, tmp, 'goCity.php?id={0}');
-
-});
-=======
->>>>>>> fd8ab0e4b0165b8ea13b39705ea58b0b76d4f7e9