Merge branch 'master' into backend_nfc

# Conflicts: # android/app/build.gradle
2021-04-26 15:07:33 +06:00 · 2021-04-26 15:07:33 +06:00 · 93e6163ef2
parent fb1f030fb1 881c96f620
commit 93e6163ef2
2 changed files with 1 additions and 2 deletions
--- a/pubspec.lock
+++ b/pubspec.lock
@ -182,7 +182,7 @@ packages:
    source: sdk
    version: "0.0.0"
  flutter_bluetooth_basic:
-    dependency: "direct main"
+    dependency: transitive
    description:
      name: flutter_bluetooth_basic
      url: "https://pub.dartlang.org"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -35,7 +35,6 @@ dependencies:
    flutter_lock_screen: ^1.0.8
    local_auth: ^0.6.3+4
    esc_pos_bluetooth: ^0.2.8
-    flutter_bluetooth_basic: ^0.1.5
    esc_pos_utils: ^0.3.6 # no edit for esc_pos_bluetooth: ^0.2.8
    charset_converter: ^1.0.3
 dev_dependencies: