ActualHorse/CarmenSandiego
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

Resolving yet more merge conflicts, which are actually the same ones somehow.

Browse Source
This commit is contained in:
Jamie Greunbaum 2025-06-08 16:55:22 -04:00
parent 6fa9fbb6af
commit 0bc27a6915
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Audio/Music/The Chase.ogg.meta
View File

@ -1,5 +1,9 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Audio/Music/The Chase.ogg.meta
guid: 408c94c3132deb04187b5f2ac79f075d guid: 408c94c3132deb04187b5f2ac79f075d
========
guid: ada408cff3af7d64088105703fc32e60
>>>>>>>> cc2647a (- Added Think About It music, and final round buzzer sounds.):Assets/Audio/Music/Think About It.ogg.meta
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 7 serializedVersion: 7

BIN
Raw Files/SFX/Think About It.aup3 Normal file
View File

Binary file not shown.