changeset 24:df23b681d178

fix merge
author Kazuma Takeda
date Fri, 16 Dec 2016 00:02:08 +0900
parents e1f3843950f7
children 3039d158e31b
files src.meta
diffstat 1 files changed, 0 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src.meta	Thu Dec 15 23:59:10 2016 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 6b794ae322075482facd9dfc4488bfd5
-folderAsset: yes
-timeCreated: 1478444950
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: