2025-03-20 08:58:01 +00:00
1 changed files with 0 additions and 4 deletions
--- a/src/components/common/SendEmailDialog.vue
+++ b/src/components/common/SendEmailDialog.vue
@ -60,11 +60,7 @@ async function confirm() {
                    v-model="address"
                    is-outlined
                    autofocus
-<<<<<<< HEAD
-                    data-cy="sendEmailDialog_address"
-=======
                    data-cy="SendEmailNotifiactionDialogInput"
->>>>>>> a0e79104a8b3a1cb1be132b13f30759a4ea2e007
                />
            </QCardSection>
            <QCardActions align="right">