squash!

PlayForm · May 15, 2024 · 159d8a9 · 159d8a9
2 parents 937c3d6 + 81f6ac5
commit 159d8a9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/GitHub.yml b/.github/workflows/GitHub.yml
@@ -50,7 +50,11 @@ jobs:
             TELEMETRY_DISABLED: 1
 
         steps:
+<<<<<<< HEAD
             - uses: pozil/[email protected]
+=======
+            - uses: pozil/[email protected]
+>>>>>>> 81f6ac52650a1b638d158b165aadaf03f69bdfa8
               with:
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
                   assignees: NikolaRHristov