wip

pedjak · Nov 24, 2023 · e5e5637 · e5e5637
1 parent 0d63c67
commit e5e5637
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/diff.yaml b/.github/workflows/diff.yaml
@@ -13,4 +13,8 @@ jobs:
         uses: pedjak/crossplane-diff-action@action
         with:
           dir: examples
+<<<<<<< HEAD
           github-token: ${{ secrets.GITHUB_TOKEN }}
+=======
+          token: ${{ secrets.GITHUB_TOKEN }}
+>>>>>>> 4432273 (wip)