Skip to content

Commit 52c09c8

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

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

.github/workflows/flutter_ci.yaml

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

104+
<<<<<<< Updated upstream
104105
- if: "$RUNNER_OS" == "Linux"
105106
name: Build Flutter unit test lib
107+
=======
108+
- name: Build Flutter unit test lib
109+
>>>>>>> Stashed changes
106110
working-directory: frontend
107111
run: |
108112
cargo make build-test-lib
109113
110-
- if: "$RUNNER_OS" == "Linux"
111-
name: Run Flutter unit tests
114+
- name: Run Flutter unit tests
112115
working-directory: frontend/app_flowy
113116
run: |
114117
flutter pub get

0 commit comments

Comments
 (0)