Bläddra i källkod

Merge branch 'dev' of http://47.96.66.225:10080/chelios/xsdmx-CocosCreator into dev

# Conflicts:
#	local/local.json
licong 3 år sedan
förälder
incheckning
093abf47df
2 ändrade filer med 58 tillägg och 12 borttagningar
  1. 0 12
      assets/resources/element_spine/ZA105.meta
  2. 58 0
      local/local.json

+ 0 - 12
assets/resources/element_spine/ZA105.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "10dd2548-21f4-4369-b382-c7371b025f7f",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

+ 58 - 0
local/local.json

@@ -1,10 +1,51 @@
 {
   "last-edit": null,
   "recent-items": [
+<<<<<<< HEAD
+=======
+    "c9487f27-70f0-4012-bf79-ce48f9814dcb",
+    "9fb099ea-142d-418f-a1e8-f5a46e4f27ee",
+    "b20fa46e-e493-40ba-a335-7379ec86a2cb",
+    "a972bb11-bb49-4d02-898f-7c2e78f109d1",
+    "ed2eb25b-c86d-45e1-af89-df8acbd7b3f0",
+    "2576e95c-82ed-42b3-8927-2e79aa6486b0",
+    "905aac31-214a-4652-8e15-ae6afd4bb8b9",
+    "17196ada-2513-46d0-bdd4-961a13bf430d",
+    "d68bf72b-7bdb-48f0-be9a-3b0a4de7f2ce",
+    "1edbf86f-3486-408d-97ec-bc31fb6395d1",
+    "aa4d574e-420c-47ae-bfa1-768309e25aa0",
+    "3d970ea4-c1a7-4b5e-a794-be2a897474f0",
+    "1fbc18b8-3bde-4f5f-8f1d-e7ce637b6616",
+    "00e7d7b2-4a8c-47e2-be29-2a79dee2c720",
+    "2d2f792f-a40c-49bb-a189-ed176a246e49",
+    "ff982981-097a-4e0e-8734-bfc340c5f129",
+    "45bf96c6-d384-4b20-acce-9ce392c137ac",
+    "ef51e114-7b1f-486c-9269-6af26d417ae8",
+    "17ad2a77-62ab-4903-ac54-252be1792308",
+    "11364221-35d8-475e-b9ec-43ab3aa2993d",
+    "68a3997f-98c2-4008-8a2a-569dad5ab209",
+    "c41951b4-1379-413b-84ba-62e45c5e4561",
+    "e3612138-ec3b-404f-8232-0cabe743bcc7",
+    "e18cbf3b-5ab8-4c87-871a-a2c51ce55790",
+    "d14d519b-6493-4bf0-bbdd-1438c31926e2",
+    "99605191-cf27-4d54-a9d4-acb3805dc45d",
+    "b026e3d7-1015-4a57-853d-b88c21e9c499",
+    "d1a2ef47-969e-4cde-a796-a3cd475d8bed",
+    "1051392c-148f-41a1-9267-9ef5f129a6e9",
+    "41ffe928-29fe-4bd7-933b-6deda3500016",
+    "7ac1727a-906d-447e-84b1-ca14a649311c",
+    "bacf0829-5e61-4fa9-b3bd-cb3472b1cb42",
+    "7657f40d-bece-48f6-bcf3-9df3840fb551",
+    "1dd1b738-6fcc-472c-aef0-635d214a6118",
+    "165d9521-f2fa-40d9-bbe9-1d4f4c5d4775",
+    "54e0cd76-2c63-4e23-b81c-97efe2699791",
+    "51a7178b-1133-44d1-92b5-5f5e1e2348a4",
+>>>>>>> ae23f3346e0710d38f11c57b7277d107f594c70f
     "81823765-7aef-47ac-b793-287673d47aa3",
     "c1fa2217-e454-46ca-ad7b-31c2afa8adc4",
     "1cc87fa7-097b-4f10-aecb-49dcb1713bac",
     "4445850f-898f-47e8-a574-c2c63a1e36a7",
+<<<<<<< HEAD
     "35b14081-9e0f-45a5-a804-a787c942ff47",
     "69b3a8ee-9d9c-4120-8fa0-0e9aba59b472",
     "147ce141-b17c-4434-87f7-2b12cb885bb7",
@@ -13,5 +54,22 @@
     "b35d96ee-2781-46d3-b7a3-75407c00d8eb",
     "d109550d-0d11-4e32-90e1-bf0c2e80f637",
     "165d9521-f2fa-40d9-bbe9-1d4f4c5d4775"
+=======
+    "af111354-8962-48b7-93db-eee87d40b1fe",
+    "147ce141-b17c-4434-87f7-2b12cb885bb7",
+    "fb1460ea-e74b-47b2-8467-efbbba57a4ca",
+    "686bd299-de37-43fe-b735-f5a6dd1f9e13",
+    "39a60824-c678-4b33-a8e7-c5c2f8f7bb9e",
+    "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c",
+    "2777c629-901f-467d-b9c5-838129207240",
+    "35b14081-9e0f-45a5-a804-a787c942ff47",
+    "69b3a8ee-9d9c-4120-8fa0-0e9aba59b472",
+    "13452eaf-a0d0-4b0a-82d2-f5fc7cf793bb",
+    "45502707-7b13-4ee2-934a-1eaf3254b1c1",
+    "4fa20b44-a925-4cf5-b13a-14c21e455b02",
+    "891e36f9-7931-427e-b549-e16b827a1fb2",
+    "d109550d-0d11-4e32-90e1-bf0c2e80f637",
+    "9ae25294-b58f-4060-a268-785d5e039fd2"
+>>>>>>> ae23f3346e0710d38f11c57b7277d107f594c70f
   ]
 }