This commit is contained in:
PokingPines
2024-04-23 08:28:58 +02:00
parent ae9838c02e
commit 6979490b55
2 changed files with 2 additions and 2 deletions

View File

@@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
guid: d884527f3e242c144af52b11faf49d2f
guid: 8c4ea7980396ef44790197912891dea8
=======
guid: d5d570160164b804ca24a36b21a621db
folderAsset: yes

View File

@@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/ML-Agents/Timers/SampleScene_timers.json.meta
guid: 4af2646cae3014146bf467e2830fdb41
guid: 604fbff49b150b941bdc2ebd21de54e8
TextScriptImporter:
=======
guid: 27000db5eaa3d9f42bceff430c265d3a