Merge branch '13.0' of https://github.com/mga-odoo/odoobooks into 13.0

mga-odoo · May 25, 2020 · 62bf982 · 62bf982
2 parents ec30389 + bedc0f0
commit 62bf982
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/docs/accounting/invoice/create-first-customer-invoice-and-register-payment.rst b/docs/accounting/invoice/create-first-customer-invoice-and-register-payment.rst
@@ -4,20 +4,26 @@
    single: Customer Invoice
    single: Register Payment
 
+<<<<<<< HEAD
 .. meta::
   :description: Create your first invoice, send to customer, receive and register payment
   :keywords: customer, invoice, invoicing, payment, register, invoicing, accounting
 
+=======
+>>>>>>> bedc0f0d358115a80f96c78ae8fd8a8563435177
 ==================================================
 Create first customer invoice and register payment
 ==================================================
 
+<<<<<<< HEAD
 Business case
 -------------
 The company just started the operation and wanted to generate some customer
 invoices, here is a perfect example of the same.
 
 
+=======
+>>>>>>> bedc0f0d358115a80f96c78ae8fd8a8563435177
 Video
 -----
 Access the video at https://www.youtube.com/watch?v=qU8Ha_HpJtk