chore: merge with main

splunk · Apr 11, 2024 · 8c41e5d · 8c41e5d
1 parent f5599da
commit 8c41e5d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml
@@ -869,11 +869,7 @@ jobs:
           name: package-splunkbase
           path: build/package/
       - name: Scan
-<<<<<<< HEAD
-        uses: splunk/[email protected]
-=======
         uses: splunk/[email protected]
->>>>>>> main
         with:
           app_path: build/package/
           included_tags: ${{ matrix.tags }}