From 4a6de7b4d06cf69b945a911d2a6f9595307024de Mon Sep 17 00:00:00 2001
From: sonal arora <sonal.arora@apagen.com>
Date: Mon, 14 Sep 2020 09:37:44 +0000
Subject: [PATCH] work on sales report

---
 reports/__manifest__.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/reports/__manifest__.py b/reports/__manifest__.py
index f7a3cc2..8b3cdf3 100644
--- a/reports/__manifest__.py
+++ b/reports/__manifest__.py
@@ -10,11 +10,7 @@
     'maintainer': '',
     'website': "",
     'depends': [
-<<<<<<< Updated upstream
-        'base','account', 'bi_professional_reports_templates'
-=======
         'base','report', 'account', 'bi_professional_reports_templates'
->>>>>>> Stashed changes
     ],
     'data': [
         'views/invoice_report.xml',