fix pre-commit

kapicorp · Oct 1, 2023 · a0d85ee · a0d85ee
1 parent 30ed45b
commit a0d85ee
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,9 +1,9 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 23.9.1
     hooks:
     - id: black
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.32.2
+    rev: v0.37.0
     hooks:
     - id: markdownlint-fix
diff --git a/kapitan/refs/secrets/vaultkv.py b/kapitan/refs/secrets/vaultkv.py
@@ -16,11 +16,8 @@
 from kapitan.refs.base64 import Base64Ref, Base64RefBackend
 from kapitan.refs.vault_resources import VaultClient, VaultError
 
-<<<<<<< HEAD
 from hvac.exceptions import Forbidden, InvalidPath
 
-=======
->>>>>>> 6ceb580 (changes from black/isort)
 logger = logging.getLogger(__name__)
 
 

diff --git a/kapitan/refs/secrets/vaulttransit.py b/kapitan/refs/secrets/vaulttransit.py
@@ -18,11 +18,8 @@
 from kapitan.refs.base64 import Base64Ref, Base64RefBackend
 from kapitan.refs.vault_resources import VaultClient, VaultError
 
-<<<<<<< HEAD
 from hvac.exceptions import Forbidden, InvalidPath
 
-=======
->>>>>>> 6ceb580 (changes from black/isort)
 logger = logging.getLogger(__name__)