Resolving another fucking merge conflict with files that never changed.

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
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d3a32efe2355015408181f263148aa5b
guid: 3706c5fb6f7901a429b0066b315e7a71
AudioImporter:
externalObjects: {}
serializedVersion: 7
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ada408cff3af7d64088105703fc32e60
guid: ebb0e1809180b8e4b8ae4c4fe1671ae7
AudioImporter:
externalObjects: {}
serializedVersion: 7
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,41 @@
fileFormatVersion: 2
guid: fd2e7d68447011640a244f302d442395
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.84999996
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
4:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.25
conversionMode: 0
preloadAudioData: 0
7:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.25
conversionMode: 0
preloadAudioData: 0
forceToMono: 1
normalize: 1
loadInBackground: 1
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,41 @@
fileFormatVersion: 2
guid: f464650920c273d4fb42a86c4acaf05f
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.84999996
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
4:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.25
conversionMode: 0
preloadAudioData: 0
7:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.25
conversionMode: 0
preloadAudioData: 0
forceToMono: 1
normalize: 1
loadInBackground: 1
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant: