From e93cc463be9c71a584d8d3324a06c0c2ecc9bb4d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Thu, 5 Jun 2025 16:18:48 +0530
Subject: [PATCH] chore: resolved conflict

---
 frontend/src/components/Modals/OrganizationModal.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/src/components/Modals/OrganizationModal.vue b/frontend/src/components/Modals/OrganizationModal.vue
index 0e955e67..a86567d6 100644
--- a/frontend/src/components/Modals/OrganizationModal.vue
+++ b/frontend/src/components/Modals/OrganizationModal.vue
@@ -17,16 +17,12 @@
             </Button>
           </div>
         </div>
-<<<<<<< HEAD
-        <FieldLayout v-if="tabs.data?.length" :tabs="tabs.data" :data="_organization" doctype="CRM Organization" />
-=======
         <FieldLayout
           v-if="tabs.data?.length"
           :tabs="tabs.data"
           :data="organization.doc"
           doctype="CRM Organization"
         />
->>>>>>> 9362997 (refactor: organization modal code refactor)
         <ErrorMessage class="mt-8" v-if="error" :message="__(error)" />
       </div>
       <div class="px-4 pt-4 pb-7 sm:px-6">