Some conflicts resolved
This commit is contained in:
11
Assets/2026-04-26 13-58-02.mp3.mkv.meta
Normal file
11
Assets/2026-04-26 13-58-02.mp3.mkv.meta
Normal file
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Scenes/Main Screen Scenes/bubak.unity.meta
|
||||
guid: 2ac55b32f60c0f44691e1588d19d610f
|
||||
========
|
||||
guid: d6a21cbd9c8f68f4fbe65763566ca7c9
|
||||
>>>>>>>> origin/main:Assets/2026-04-26 13-58-02.mp3.mkv.meta
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user