From d793379a9ebb6164dc7ac3f01b09f69892209f3a Mon Sep 17 00:00:00 2001 From: fkantelberg Date: Wed, 29 May 2019 12:08:58 +0200 Subject: [PATCH] Merge conflict --- odoo_module/__init__.py | 0 odoo_module/__manifest__.py | 8 ++++++++ 2 files changed, 8 insertions(+) create mode 100644 odoo_module/__init__.py create mode 100644 odoo_module/__manifest__.py diff --git a/odoo_module/__init__.py b/odoo_module/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/odoo_module/__manifest__.py b/odoo_module/__manifest__.py new file mode 100644 index 00000000..53aa2ee4 --- /dev/null +++ b/odoo_module/__manifest__.py @@ -0,0 +1,8 @@ +{ + "name": "odoo module", + "version": "12.0.2.0.0", + "author": "Author, Odoo Community Association (OCA)", + "summary": "summary", + "license": "LGPL-3", + "installable": True, +}