LAPTOP-NFGSIHNQ\shump c10f3421f5 Merge branch 'Shumpei' into portals-and-body
# Conflicts:
#	Assets/LowPolyDungeons/LowPolyDungeons_HDRP_2018.4.unitypackage.meta
#	Assets/LowPolyDungeons/LowPolyDungeons_LWRP_2018.4.unitypackage.meta
#	Assets/LowPolyDungeons/LowPolyDungeons_URP_2019.3.unitypackage.meta
#	Assets/Project Files/Scripts/Shumpei.meta
#	Assets/SimpleNaturePack/SimpleNaturePack_HDRP_2018.4.unitypackage.meta
2022-03-25 10:46:05 +02:00

13 lines
359 B
Plaintext

fileFormatVersion: 2
<<<<<<< HEAD:Assets/LowPolyDungeons/LowPolyDungeons_HDRP_2018.4.unitypackage.meta
guid: c9f42f34fc0706c499aa448484f3db62
=======
guid: 20b2cd43130816e429a419c3adf589b0
folderAsset: yes
>>>>>>> Shumpei:Assets/Project Files/Scripts/Shumpei.meta
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: