test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolved conflict

Browse Source
This commit is contained in:
Shariq Ansari 2025-07-31 16:21:52 +05:30 committed by GitHub
parent 6b00ede6ad
commit fe02a9077f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/pages/Deal.vue
View File

@ -121,8 +121,6 @@
</Button> </Button>
</div> </div>
</Tooltip> </Tooltip>
<<<<<<< HEAD
=======
<Tooltip :text="__('Delete')"> <Tooltip :text="__('Delete')">
<div> <div>
<Button <Button
@ -133,7 +131,6 @@
/> />
</div> </div>
</Tooltip> </Tooltip>
>>>>>>> 0144bc10 (fix: use document.doc instead of lead.data/deal.data)
</div> </div>
</div> </div>
</div> </div>