squash!

Signed-off-by: Nikola Hristov <[email protected]>
PlayForm · May 15, 2024 · 4b9f670 · 4b9f670
1 parent 5d0e83e
commit 4b9f670
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/GitHub.yml b/.github/workflows/GitHub.yml
@@ -50,11 +50,7 @@ jobs:
             TELEMETRY_DISABLED: 1
 
         steps:
-<<<<<<< HEAD
             - uses: pozil/[email protected]
-=======
-            - uses: pozil/[email protected]
->>>>>>> 2cc98232225476f535739e1523bdc95620da60be
               with:
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
                   assignees: NikolaRHristov