Update .pre-commit-config.yaml

Author: Felix Exner (fexner)

.pre-commit-config.yaml

@@ -33,21 +33,13 @@ repos:
 
   # Python hooks
   - repo: https://github.com/asottile/pyupgrade
-<<<<<<< HEAD
-    rev: v3.9.0
-=======
     rev: v3.18.0
->>>>>>> 6255cff (Auto-update pre-commit hooks (#1147))
     hooks:
     -   id: pyupgrade
         args: [--py36-plus]
 
   - repo: https://github.com/psf/black
-<<<<<<< HEAD
-    rev: 23.3.0
-=======
     rev: 24.10.0
->>>>>>> 6255cff (Auto-update pre-commit hooks (#1147))
     hooks:
       - id: black
         args: ["--line-length=100"]