From 0fa2d55506493408c68cb3a2ee1818b3584102b1 Mon Sep 17 00:00:00 2001
From: Ivan Rasputin <iel@odoo.com>
Date: Mon, 11 Dec 2023 15:49:39 +0100
Subject: [PATCH] fix git migration conflicts

---
 .github/workflows/pre-commit.yml            | 2 +-
 .pre-commit-config.yaml                     | 2 +-
 workflow-files/odoo-module-migrator-mix.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 6d8803c..353d4c2 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-python@v1
         with:
-          python-version: "3.7.x"
+          python-version: "3.8.x"
       - name: Check Python Version
         run: echo "PY=$(python --version --version | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
       - uses: actions/cache@v1
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