From 1bf1d618943a26acfdb7f8af9c8303d387eecc6b Mon Sep 17 00:00:00 2001
From: FRANCIS LOPEZ <francislopez@Francis-Macbook.local>
Date: Sat, 24 Oct 2015 13:54:12 -0500
Subject: [PATCH] change level.json

---
 assets/data/levels.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/assets/data/levels.json b/assets/data/levels.json
index 9c15c87..6d54a9f 100755
--- a/assets/data/levels.json
+++ b/assets/data/levels.json
@@ -3,7 +3,6 @@
     "title": "Cave",
     "tileset": "tilemap_cave",
     "rockId": 1214,
-<<<<<<< HEAD
     "data":[[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
             [0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0],
             [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -14,15 +13,11 @@
             [0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0],
             [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]
 
-=======
-    "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
->>>>>>> a85871d8422cc93d715a1de95d9ae54cc9bd37a9
   },
   {
     "title": "Ice Cave",
     "tileset": "tilemap_cave",
     "rockId": 974,
-<<<<<<< HEAD
     "data":[[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     [0, 974, 974, 974, 974, 974, 974, 0, 974, 0, 0, 0, 0, 0, 0],
     [0, 0, 0, 0, 0, 0, 974, 974, 974, 0, 974, 974, 974, 974, 0],
@@ -32,14 +27,19 @@
     [0, 0, 0, 0, 974, 0, 974, 974, 974, 974, 974, 974, 0, 0, 0],
     [0, 0, 974, 974, 974, 0, 974, 0, 0, 974, 0, 0, 0, 974, 0],
     [0, 0, 0, 0, 0, 0, 0, 0, 0, 974, 0, 0, 0, 974, 0]]
-=======
-    "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 974, 974, 974, 974, 974, 974, 0, 974, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 974, 974, 974, 0, 974, 974, 974, 974, 0, 0, 0, 974, 974, 974, 0, 974, 0, 974, 0, 0, 0, 0, 974, 0, 0, 0, 0, 0, 974, 0, 974, 0, 974, 0, 0, 0, 0, 0, 0, 0, 974, 974, 0, 974, 0, 0, 0, 0, 0, 974, 0, 0, 974, 0, 0, 0, 0, 0, 974, 0, 974, 974, 974, 974, 974, 974, 0, 0, 0, 0, 0, 974, 974, 974, 0, 974, 0, 0, 974, 0, 0, 0, 974, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 974, 0, 0, 0, 974, 0]
->>>>>>> a85871d8422cc93d715a1de95d9ae54cc9bd37a9
   },
   {
     "title": "Grass",
     "tileset": "tilemap_grass",
     "rockId": 23,
-    "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 23, 0, 23, 0, 23, 0, 23, 0, 23, 0, 0, 0, 0, 0, 0, 23, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 23, 0, 23, 0, 0, 0, 23, 0, 0, 23, 23, 23, 0, 0, 0, 0, 0, 23, 0, 23, 0, 0, 0, 0, 0, 0, 23, 0, 0, 23, 23, 0, 23, 0, 23, 23, 23, 23, 23, 23, 0, 23, 0, 0, 0, 23, 0, 0, 0, 0, 23, 0, 23, 0, 23, 0, 23, 0, 0, 0, 23, 0, 23, 23, 23, 23, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+    "data":[[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 0, 23, 0, 23, 0, 23, 0, 23, 0, 23, 0, 23, 0, 0],
+    [0, 0, 0, 0, 23, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0],
+    [0, 23, 23, 0, 23, 0, 0, 0, 23, 0, 0, 23, 23, 23, 0],
+    [0, 0, 0, 0, 23, 0, 23, 0, 0, 0, 0, 0, 0, 23, 0],
+    [0, 23, 23, 0, 23, 0, 23, 23, 23, 23, 23, 23, 0, 23, 0],
+    [0, 0, 23, 0, 0, 0, 0, 23, 0, 23, 0, 23, 0, 23, 0],
+    [0, 0, 23, 0, 23, 23, 23, 23, 0, 0, 0, 23, 0, 0, 0],
+    [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]
   }
 ]