resolve merge conflict

2023-02-12 06:15:27 +01:00
parent 0a58280f3d
commit 0e00805187
83 changed files with 1733 additions and 1101 deletions
@@ -39,7 +39,7 @@ jobs:
        uses: subosito/flutter-action@v2
        with:
          channel: "stable"
-          flutter-version: "3.3.10"
+          flutter-version: "3.7.3"
          cache: true

      - name: Create the Keystore