8a94ce9de3
# Conflicts: # .idea/.idea.AwesomeRunner/.idea/.gitignore # .vscode/settings.json # Assets/ParticleSystems/lasers/lasers2.unitypackage.meta # Assets/Scenes/DeathScreen.unity.meta # Assets/Scenes/GameScene.unity # Assets/Scenes/MainMenu.unity # Assets/ScriptableObjects/PlayerData.asset # Assets/Scripts/Player/Health.cs # Assets/Scripts/Player/Player.cs # Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset # Assets/TextMesh Pro/Examples & Extras/Scenes/27 - Double Pass Shader Example.unity.meta # ProjectSettings/EditorBuildSettings.asset
12 lines
392 B
Plaintext
12 lines
392 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<<< HEAD:Assets/TextMesh Pro/Examples & Extras/Scenes/27 - Double Pass Shader Example.unity.meta
|
|
guid: 3b38a6ba32b869f48812e595baf39746
|
|
========
|
|
guid: 9fc0d4010bbf28b4594072e72b8655ab
|
|
>>>>>>>> 4c350d16a4b31db0659a0e5146e5626a353b2200:Assets/Scenes/DeathScreen.unity.meta
|
|
DefaultImporter:
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|