Merge branch 'main' into develop

splunk · Apr 11, 2024 · f5599da · f5599da
2 parents 082c8b9 + bfc6713
commit f5599da
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml
@@ -869,7 +869,11 @@ 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 }}