src/app/components/VoiceCallAudioSettingsDialog.svelte

@@ -5,10 +5,7 @@
   import ModalBody from "@lib/components/ModalBody.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import ModalHeader from "@lib/components/ModalHeader.svelte"
-<<<<<<< HEAD
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
-=======
->>>>>>> 462086da (Add settings button to configure audio devices in call)
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import {
     currentVoiceSession,

src/app/components/VoiceWidget.svelte

@@ -119,11 +119,6 @@
           onclick={toggleCamera}>
           <Icon icon={$currentVoiceSession.cameraOn ? VideocameraRecord : Videocamera} size={4} />
         </Button>
-        <Button>
-          data-tip="Audio settings" class="center tooltip tooltip-top btn btn-sm btn-square
-          btn-ghost" onclick={openAudioSettings}>
-          <Icon icon={Settings} size={4} />
-        </Button>
         <Button
           data-tip={$currentVoiceSession.screenShareOn ? "Stop sharing" : "Share screen"}
           class="center tooltip tooltip-top btn btn-sm btn-square {$currentVoiceSession.screenShareOn