Skip to content

Commit f5599da

Browse files
committed
Merge branch 'main' into develop
2 parents 082c8b9 + bfc6713 commit f5599da

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

.github/workflows/reusable-build-test-release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,11 @@ jobs:
869869
name: package-splunkbase
870870
path: build/package/
871871
- name: Scan
872+
<<<<<<< HEAD
872873
uses: splunk/appinspect-cli-action@v2.5
874+
=======
875+
uses: splunk/appinspect-cli-action@v2.6
876+
>>>>>>> main
873877
with:
874878
app_path: build/package/
875879
included_tags: ${{ matrix.tags }}

0 commit comments

Comments
 (0)