From fe02a9077f17cad8ed37060492fe1ed60c74537e Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Thu, 31 Jul 2025 16:21:52 +0530
Subject: [PATCH] chore: resolved conflict

---
 frontend/src/pages/Deal.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index de9aa078..7c8e9605 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -121,8 +121,6 @@
                 </Button>
               </div>
             </Tooltip>
-<<<<<<< HEAD
-=======
             <Tooltip :text="__('Delete')">
               <div>
                 <Button
@@ -133,7 +131,6 @@
                 />
               </div>
             </Tooltip>
->>>>>>> 0144bc10 (fix: use document.doc instead of lead.data/deal.data)
           </div>
         </div>
       </div>