fix(tekscope_2k): Added HEADER setting calls so that SELECT? function…

…s properly (#326)
tektronix · Oct 24, 2024 · 2ec96eb · 2ec96eb
1 parent 409230f
commit 2ec96eb
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -138,12 +138,7 @@ repos:
         always_run: true
         args: [audit, --json, --ignore-code=CVE-2019-8341]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-<<<<<<< HEAD
-    rev: 8b5112a3b2ad121439a2092f8ff548c0d80f2514  # frozen: v0.6.1
-
-=======
     rev: 24d039e647a08707e6cb31e75e01844eeff925e7  # frozen: v0.6.2
->>>>>>> 266e6b6 (Convert to using reusable workflows from the `tektronix/python-package-ci-cd` repo (#284))
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]