diff --git a/Assets/Scenes/Level_Final.unity b/Assets/Scenes/Level_Final.unity index 4e41358b5395fa07244af748fddf359dbaa3288f..19752f0eb0179812d55b4edf1e001569db352cf6 100644 --- a/Assets/Scenes/Level_Final.unity +++ b/Assets/Scenes/Level_Final.unity @@ -2006,19 +2006,12 @@ MonoBehaviour: gunMode: 1 damagePerShot: 30 gunAudioSrc: -<<<<<<< HEAD - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} -======= - {fileID: 8300000, guid: fa7f046ce321d4021b5e753bf1152916, type: 3} - {fileID: 8300000, guid: ba7220d25e509f9409ceacf04b5962e2, type: 3} - {fileID: 8300000, guid: ea3810a94c786994592b4af9547b4c46, type: 3} - {fileID: 8300000, guid: 0a5dd97bd0604d44397959b4c9a0deb9, type: 3} BowSliderIcon: {fileID: 1456880656} BowSlider: {fileID: 806967238} ->>>>>>> 91d4d968aed39017c46150f8bc493614eaf496cc --- !u!82 &880479557 AudioSource: m_ObjectHideFlags: 0