fix merge conflict.

Browse Source

...

This commit is contained in:

a.bouhuolia

2021-02-21 19:43:21 +02:00

parent 947e5ad33d

commit 1e3b8df702

8 changed files with 15 additions and 16 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

client/src/containers/Sales/Estimates/EstimateForm/EstimateDrawer.js → client/src/containers/Sales/Estimates/EstimateDetails/EstimateDrawer.js

0

client/src/containers/Sales/Invoices/InvoiceForm/InvoiceDrawer.js → client/src/containers/Sales/Invoices/InvoiceDetails/InvoiceDrawer.js

0

client/src/containers/Sales/PaymentReceive/PaymentReceiveDrawer.js → client/src/containers/Sales/PaymentReceives/PaymentDetails/PaymentDrawer.js

0

client/src/containers/Sales/Receipts/ReceiptForm/ReceiptDrawer.js → client/src/containers/Sales/Receipts/ReceiptDetails/ReceiptDrawer.js