From 9e01dffca0c7796b01ef712dbea9513afbf26ee7 Mon Sep 17 00:00:00 2001 From: Ivan Rasputin Date: Mon, 11 Dec 2023 15:49:39 +0100 Subject: [PATCH] fix git migration conflicts --- .pre-commit-config.yaml | 2 +- workflow-files/odoo-module-migrator-mix.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 18d41d3..be66c8b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -46,7 +46,7 @@ repos: hooks: - id: pyupgrade - repo: https://github.com/PyCQA/isort - rev: 5.5.1 + rev: 5.12.0 hooks: - id: isort name: isort except __init__.py diff --git a/workflow-files/odoo-module-migrator-mix.yml b/workflow-files/odoo-module-migrator-mix.yml index 8d9a4b3..abcb2d1 100644 --- a/workflow-files/odoo-module-migrator-mix.yml +++ b/workflow-files/odoo-module-migrator-mix.yml @@ -5,5 +5,5 @@ merges: - oca master #- oca refs/pull/12345/head - - itpp-labs change-odoo-version-only + - itpp-labs change-odoo-version-only-2024 target: oca master