diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue index 260aaa0d..383e5fdd 100644 --- a/frontend/src/pages/Deal.vue +++ b/frontend/src/pages/Deal.vue @@ -131,6 +131,19 @@ +<<<<<<< HEAD +======= + +
+
+
+>>>>>>> abc50182 (fix: update delete button click handler in Deal component)