resolve merge conflict

2023-02-12 06:15:27 +01:00
parent 0a58280f3d
commit 0e00805187
83 changed files with 1733 additions and 1101 deletions
@@ -49,7 +49,7 @@ jobs:
        uses: subosito/flutter-action@v2
        with:
          channel: 'stable'
-          flutter-version: '3.3.10'
+          flutter-version: '3.7.3'
      - name: Run tests
        working-directory: ./mobile
        run: flutter test
@@ -78,7 +78,7 @@ jobs:
        uses: subosito/flutter-action@v2
        with:
          channel: 'stable'
-          flutter-version: '3.3.10'
+          flutter-version: '3.7.3'
      - name: Run integration tests
        uses: reactivecircus/android-emulator-runner@v2.27.0
        with: