From 2013b6fef379429fa81ef742e2ca6aea8aabea97 Mon Sep 17 00:00:00 2001
From: art_yxc <616551813@qq.com>
Date: 星期二, 29 一月 2019 17:32:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

---
 Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat.meta |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat.meta b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat.meta
index 018f3d8..e18db01 100644
--- a/Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat.meta
+++ b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 957c5cd476447e74281d6373c4e1177f
-timeCreated: 1548298930
+guid: ff22e68a3c77411469a1fca9a8e1a078
+timeCreated: 1548741531
 licenseType: Pro
 NativeFormatImporter:
   mainObjectFileID: 2100000

--
Gitblit v1.8.0