fix merge

5 years ago · 2a71c2ab79
parent 3653c90665
commit 2a71c2ab79
1 changed files with 0 additions and 3 deletions
--- a/pubspec.lock
+++ b/pubspec.lock
@ -36,8 +36,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.4.1"
-<<<<<<< HEAD
-=======
  barcode_scan:
    dependency: "direct main"
    description:
@ -45,7 +43,6 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "3.0.1"
->>>>>>> 8f56c5104af4e78067c70eb1e034615f45fcf6fc
  bazel_worker:
    dependency: transitive
    description: