From 887f921ba58aee0f29745f403219440991d84548 Mon Sep 17 00:00:00 2001 From: Rohit Nayak Date: Thu, 28 Sep 2023 21:29:33 +0200 Subject: [PATCH] Fix conflicts Signed-off-by: Rohit Nayak --- .github/workflows/static_checks_etc.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/static_checks_etc.yml b/.github/workflows/static_checks_etc.yml index a9355ebc635..2a7033c88c0 100644 --- a/.github/workflows/static_checks_etc.yml +++ b/.github/workflows/static_checks_etc.yml @@ -24,15 +24,6 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' uses: actions/checkout@v3 -<<<<<<< HEAD - - name: Run FOSSA scan and upload build data - if: steps.skip-workflow.outputs.skip-workflow == 'false' - uses: fossa-contrib/fossa-action@v1 - with: - fossa-api-key: 76d7483ea206d530d9452e44bffe7ba8 - -======= ->>>>>>> fd9b7d623d (Remove FOSSA Test from CI until we can do it in a secure way (#14119)) - name: Check for changes in Go files if: steps.skip-workflow.outputs.skip-workflow == 'false' uses: frouioui/paths-filter@main