From c002c9e2455a96ed890cb7c544b1c0e59f2cd286 Mon Sep 17 00:00:00 2001
From: Jose Olarte III <brownspank@anomalistdesign.com>
Date: Fri, 4 Jul 2025 17:19:04 +0800
Subject: [PATCH] Fix: remove duplicates from merge conflict

---
 src/components/GiftedDialog.vue | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue
index 2d606ee3..4748414f 100644
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -228,9 +228,6 @@ export default class GiftedDialog extends Vue {
     // Update entity types based on current props
     this.updateEntityTypes();
 
-    // Update entity types based on current props
-    this.updateEntityTypes();
-
     try {
       const settings = await databaseUtil.retrieveSettingsForActiveAccount();
       this.apiServer = settings.apiServer || "";
@@ -373,20 +370,6 @@ export default class GiftedDialog extends Vue {
       return;
     }
 
-    // Check for person conflict
-    if (this.hasPersonConflict) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You cannot select the same person as both giver and recipient.",
-        },
-        3000,
-      );
-      return;
-    }
-
     this.close();
     this.$notify(
       {