From 9ce6ba8d3f9ec3bfc0034ca2deafac3604e47923 Mon Sep 17 00:00:00 2001
From: echo <lzq.zheng@qq.com>
Date: Sun, 31 Dec 2017 01:16:58 +0800
Subject: [PATCH] merge ckcz123

---
 libs/maps.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/libs/maps.js b/libs/maps.js
index 5222f9f3..a6ee2112 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -82,20 +82,12 @@ maps.prototype.getBlock = function (x, y, id) {
     // 在这里添加更多地形
     // 如果空地不足，可以从180以后开始继续放，只要不和现有的数字冲突即可
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 2d9278f8f68fe9b269b14ae545ac03f67f572815
     // Autotile
     if (id == 20) tmp.event = {'cls': 'autotile', 'id': 'autotile', 'noPass': true}; // autotile
     // 更多的autotile从151到160，只要不和现有的数字冲突即可
     if (id == 151) tmp.event = {'cls': 'autotile', 'id': 'autotile1', 'noPass': true};
     if (id == 152) tmp.event = {'cls': 'autotile', 'id': 'autotile2', 'noPass': true};
     if (id == 153) tmp.event = {'cls': 'autotile', 'id': 'autotile3', 'noPass': true};
-<<<<<<< HEAD
-=======
-
->>>>>>> 2d9278f8f68fe9b269b14ae545ac03f67f572815
 
     ////////////////////////// 物品部分 //////////////////////////