gather-and-defend/Assets/Tiles/Farm.asset.meta.orig
Ader Alisma 01 0a88abeed1 Merge remote-tracking branch 'origin/main' into feature/pickUpYield
# Conflicts:
#	Assets/Tiles/Farm.asset
#	Assets/Tiles/Farm.asset.meta
2023-06-11 18:56:00 -04:00

13 lines
269 B
Plaintext

fileFormatVersion: 2
<<<<<<< HEAD
guid: 953a02bba997b9348bee7f306f609a96
=======
guid: 7568f730b2ba3754297a7612452482e2
>>>>>>> origin/main
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant: