충돌 병합

2018-02-01 00:41:27 +09:00
parent 45ae19d74b
commit 3b862b53eb
1 changed files with 0 additions and 15 deletions
@@ -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