Update pre-commit.yml

Author: kruskall

.github/workflows/pre-commit.yml

@@ -16,8 +16,4 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
-      - uses: elastic/oblt-actions/pre-commit@31e93d1dfb82adc106fc7820f505db1afefe43b1 # v1
-=======
       - uses: elastic/oblt-actions/pre-commit@v1
->>>>>>> 0e1f32a6 (ci: revert image pinning for internal and github actions (#17191))