Rename manifest files

OCA · Feb 3, 2021 · d892da9 · d892da9
1 parent daf437f
commit d892da9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 43 deletions.
diff --git a/connector_woocommerce/__manifest__.py b/connector_woocommerce/__manifest__.py
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # © 2009 Tech-Receptives Solutions Pvt. Ltd.
 # © 2018 Serpent Consulting Services Pvt. Ltd.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

diff --git a/connector_woocommerce/__openerp__.py b/connector_woocommerce/__openerp__.py