From 2cfc54da70f0639f662d2cd8ce08c69d813e9bd2 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 28 八月 2018 15:47:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

---
 Assets/Plugins/iOS/The2thWorldSDK/FreeSDK/FreeSDKResource.bundle/Entry.storyboardc/YLQuickRegisterSuccessViewController~ipad.nib.meta |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/Editor/Logo/lxj.meta b/Assets/Plugins/iOS/The2thWorldSDK/FreeSDK/FreeSDKResource.bundle/Entry.storyboardc/YLQuickRegisterSuccessViewController~ipad.nib.meta
similarity index 66%
copy from Assets/Editor/Logo/lxj.meta
copy to Assets/Plugins/iOS/The2thWorldSDK/FreeSDK/FreeSDKResource.bundle/Entry.storyboardc/YLQuickRegisterSuccessViewController~ipad.nib.meta
index 0de9dda..9dd6210 100644
--- a/Assets/Editor/Logo/lxj.meta
+++ b/Assets/Plugins/iOS/The2thWorldSDK/FreeSDK/FreeSDKResource.bundle/Entry.storyboardc/YLQuickRegisterSuccessViewController~ipad.nib.meta
@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 01e005808a839ab41a7de35f6d789e60
+guid: b2e760638f8fc01499aa875aca37c539
 folderAsset: yes
-timeCreated: 1533884522
+timeCreated: 1535003964
 licenseType: Free
 DefaultImporter:
   userData: 

--
Gitblit v1.8.0