Skip to content

Commit 2674d36

Browse files
committed
fix: fixed the workflow as a broken merge was committed
1 parent 77fd03c commit 2674d36

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

.github/workflows/integration.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,4 @@ jobs:
5555
working-directory: project/sanity
5656
run: |
5757
poetry add zitadel-client@../library
58-
<<<<<<< Updated upstream
59-
||||||| Stash base
60-
=======
6158
poetry run python main.py
62-
>>>>>>> Stashed changes

0 commit comments

Comments
 (0)