From f8d5689ce369f9239072d3c6a0655725e085387a Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 15 Dec 2020 16:36:52 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle

---
 Assets/00000/package/Materials/Object_036.mat.meta |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Assets/00000/package/Materials/Object_036.mat.meta b/Assets/00000/package/Materials/Object_036.mat.meta
index e24d7d1..0da7266 100644
--- a/Assets/00000/package/Materials/Object_036.mat.meta
+++ b/Assets/00000/package/Materials/Object_036.mat.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1c3d3fb3425107748a0844f4968628bd
+guid: b664a7eef3ea00845b430d5c2078be96
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 0

--
Gitblit v1.9.1