forked from coracle/flotilla
Fix merge artifacts
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user