From 7eb1a49c5440e757589cdf0c066c7ef0347c4fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Felipe=20Mil=C3=A9o?= Date: Thu, 23 May 2024 10:05:16 -0300 Subject: [PATCH] [FIX] rebase --- .pylintrc | 5 ----- .pylintrc-mandatory | 5 ----- 2 files changed, 10 deletions(-) diff --git a/.pylintrc b/.pylintrc index a55b79b..17fb0f0 100644 --- a/.pylintrc +++ b/.pylintrc @@ -9,13 +9,8 @@ readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/templat manifest_required_authors=KMEE manifest_required_keys=license manifest_deprecated_keys=description,active -<<<<<<< before updating license_allowed=LGPL-3 valid_odoo_versions=14.0 -======= -license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 -valid_odoo_versions=15.0 ->>>>>>> after updating [MESSAGES CONTROL] disable=all diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory index 2ada975..f4b0f7e 100644 --- a/.pylintrc-mandatory +++ b/.pylintrc-mandatory @@ -8,13 +8,8 @@ readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/templat manifest_required_authors=KMEE manifest_required_keys=license manifest_deprecated_keys=description,active -<<<<<<< before updating license_allowed=LGPL-3 valid_odoo_versions=14.0 -======= -license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 -valid_odoo_versions=15.0 ->>>>>>> after updating [MESSAGES CONTROL] disable=all