merge fix

This commit is contained in:
Chris Midkiff
2018-10-14 19:59:15 -04:00
parent a4b72a33f4
commit 1097262dae
3 changed files with 46 additions and 90 deletions

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 39850532bc74a4078a24832112e8aef3
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: dc278786e6540af428ccbf7825495004
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: