fix merge conflicts

This commit is contained in:
Mohit Panjwani
2020-01-31 14:28:16 +05:30
12 changed files with 35 additions and 39 deletions

View File

@ -1,6 +1,6 @@
@component('mail::message')
# Introduction
Customer viewed this Estimate.
{{ $data['user']['name'] }} viewed this Estimate.
@component('mail::button', ['url' => url('/admin/estimates/'.$data['estimate']['id'].'/view')])
Estimate

View File

@ -1,6 +1,6 @@
@component('mail::message')
# Introduction
Customer viewed this Invoice.
{{ $data['user']['name'] }} viewed this Invoice.
@component('mail::button', ['url' => url('/admin/invoices/'.$data['invoice']['id'].'/view')])
Invoice