From 1d962dd3f7701cedc35ff41b60ec4d409d7d9c0e Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Fri, 23 Jun 2017 18:11:58 +0530 Subject: [PATCH] removed conflicts --- .../customer-orders-invoices-and-shipping-status.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md index c170d911224..a5e277df4a0 100644 --- a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md +++ b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md @@ -1,19 +1,11 @@ ERPNext Web Portal gives your customers quick access to their Orders, Invoices and Shipments Customers can check the status of their orders, invoices, and shipping status by logging on to the web. -<<<<<<< HEAD -Customer Portal Order 1 - -Once an order is raised, either using the Shopping Cart or from within ERPNext, your customer can view the order and keep an eye on the billing and shipment status. When the invoice and payment against these orders are submitted, the customer can see the updated status on the portal, at a glance. - -Customer Portal Order 1 -======= Once an order is raised, either using the Shopping Cart or from within ERPNext, your customer can view the order and keep an eye on the billing and shipment status. When the invoice and payment against these orders are submitted, the customer can see the updated status on the portal, at a glance. Customer Portal>>>>>> Edited help page #### Outstanding Sales Invoice