resolve conflicts

Signed-off-by: Tejas <[email protected]>
yrs147 · Oct 10, 2023 · 2660543 · 2660543
2 parents d65833a + bdd85e5
commit 2660543
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.github/workflows/pr-merged.yaml b/.github/workflows/pr-merged.yaml
@@ -15,7 +15,10 @@ jobs:
       packages: write
       pull-requests: read
       id-token: write
+<<<<<<< HEAD
       contents: read
+=======
+>>>>>>> bdd85e5a04c262aea3f358408be7df19fca6ee38
     uses: kubescape/workflows/.github/workflows/incluster-comp-pr-merged.yaml@main
     with:
       IMAGE_NAME: quay.io/${{ github.repository_owner }}/kubescape-exporter