antoine.mcnabb 62d518a8e1 Merge fix
2016-06-25 11:57:36 -04:00

16 lines
342 B
Plaintext

fileFormatVersion: 2
<<<<<<< HEAD
guid: 40764ebe822b819449a2b0cf923f4c2e
folderAsset: yes
timeCreated: 1466858656
=======
guid: 585294b74b6b54cae92293ffbd3a2088
folderAsset: yes
timeCreated: 1466869142
>>>>>>> 7154f75c01cc58ae5d74a82380fe1a95dca97e73
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant: