clean home

2023-07-25 08:06:01 -05:00 · 2023-07-25 08:06:01 -05:00 · 464e261493
commit 464e261493
parent 733c8861fe
1 changed files with 0 additions and 3 deletions
--- a/init.py
+++ b/init.py
@ -13,11 +13,8 @@ def register():
        purchase.PurchaseLine,
        sale.Sale,
        sale.SaleLine,
-<<<<<<< HEAD
        invoice.Invoice,
        invoice.InvoiceLine,
-=======
->>>>>>> 1285df0ffd85147b613805dd27362ce123755f35
        module='analytic_operations', type_='model')
    Pool.register(
        module='analytic_operations', type_='wizard')