2bee2c42b6
# Conflicts: # .gitignore # Blacksmith/Assets/Editor/StarkBuilderSetting.asset # Blacksmith/Assets/Editor/StarkBuilderSetting.asset.meta # Blacksmith/Assets/Script/GameSystem.cs # Blacksmith/Assets/Script/UI/ForgePanel.cs # Blacksmith/UserSettings/Layouts/default-2022.dwlt # Blacksmith/project.config.json
13 lines
268 B
Plaintext
13 lines
268 B
Plaintext
fileFormatVersion: 2
|
|
guid: 96132ae8c02642748804dc8b5f9f148e
|
|
NativeFormatImporter:
|
|
externalObjects: {}
|
|
<<<<<<< Updated upstream
|
|
mainObjectFileID: 11400000
|
|
=======
|
|
mainObjectFileID: 0
|
|
>>>>>>> Stashed changes
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|