diff --git a/Assets/Audio/Music/Think About It.ogg b/Assets/Audio/Music/Think About It.ogg deleted file mode 100644 index 76a83dc..0000000 Binary files a/Assets/Audio/Music/Think About It.ogg and /dev/null differ diff --git a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg b/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg deleted file mode 100644 index ab62246..0000000 Binary files a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg and /dev/null differ diff --git a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg.meta b/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg.meta deleted file mode 100644 index 27648c7..0000000 --- a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.ogg.meta +++ /dev/null @@ -1,41 +0,0 @@ -fileFormatVersion: 2 -guid: d3a32efe2355015408181f263148aa5b -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: diff --git a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta b/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta index 6e5749a..81cda1c 100644 --- a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta +++ b/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<<< HEAD:Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta guid: f464650920c273d4fb42a86c4acaf05f +======== +guid: 680142b640a682d4a92c9935828c2311 +>>>>>>>> d6b6ce7 (Updated lots of music stuff:):Assets/Audio/Music/I Feel Good.wav.meta AudioImporter: externalObjects: {} serializedVersion: 7