fix git migration conflicts

itpp-labs · Dec 11, 2023 · 9e01dff · 9e01dff
1 parent 8dd1f33
commit 9e01dff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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