Update .pre-commit-config.yaml

Author: Felix Exner (fexner)

.pre-commit-config.yaml

@@ -15,11 +15,7 @@
 repos:
   # Standard hooks
   - repo: https://github.com/pre-commit/pre-commit-hooks
-<<<<<<< HEAD
-    rev: v3.4.0
-=======
     rev: v5.0.0
->>>>>>> 496d924 (Auto-update pre-commit hooks (#1118))
     hooks:
       - id: check-added-large-files
       - id: check-ast