Skip to content

Commit 2ccc2d7

Browse files
committed
ci: remove unsupport syntax
1 parent 52c09c8 commit 2ccc2d7

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

.github/workflows/flutter_ci.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,7 @@ jobs:
101101
working-directory: frontend/app_flowy
102102
run: flutter analyze
103103

104-
<<<<<<< Updated upstream
105-
- if: "$RUNNER_OS" == "Linux"
106-
name: Build Flutter unit test lib
107-
=======
108104
- name: Build Flutter unit test lib
109-
>>>>>>> Stashed changes
110105
working-directory: frontend
111106
run: |
112107
cargo make build-test-lib

0 commit comments

Comments
 (0)