8d523b2334
# Conflicts: # Assets/Animations/Stalker.meta # Assets/Animations/Stalker/Stalker_Armor_2D_View.jpg.meta # Assets/Animations/Stalker/Stalker_Armor_2D_View.png.meta # Assets/Animations/Stalker/Stalker_Cloth_2D_View.jpg.meta # Assets/Animations/Stalker/Stalker_Cloth_2D_View.png.meta
13 lines
256 B
Plaintext
13 lines
256 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<< HEAD
|
|
guid: 4b1c1478d1e1ebe43bbec9dfde873c91
|
|
=======
|
|
guid: 041a0d73f93693e4386135fdfbaa8b03
|
|
>>>>>>> origin/NewStory
|
|
folderAsset: yes
|
|
DefaultImporter:
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|