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

Resolving another fucking merge conflict with files that never changed.

Browse Source
This commit is contained in:
Jamie Greunbaum
2025-06-08 16:56:39 -04:00
parent 0bc27a6915
commit b1e3fd1ca2
26 changed files with 106 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/witwics.unity
+2 -2
View File
@@ -1021,7 +1021,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 24300002, guid: 6a25e5828fa5ccb4495cc6300b09a686,
type: 2}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
@@ -14773,7 +14773,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 24300002, guid: aee65367b763a1b48875117a038466bd,
type: 2}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0