# Conflicts: # GameClient/Assets/ResIn/Config.meta
@@ -3,6 +3,6 @@ svn up --force --accept tc
cd ../../../
git pull
-git submodule foreach git pull
+git submodule update
pause
@@ -1 +1 @@
-Subproject commit 376f3fa7f7e04d01df06e736c4e9a95661543e1e
+Subproject commit cffdd22715bb605ad381c546d7a19691d2d85bbe
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: f6f65997b10f98946b108b0d4740ffe7
+guid: f3e788236d9da284e8fa725fc87ababd
folderAsset: yes
DefaultImporter:
externalObjects: {}