|
|
|
@ -36,8 +36,6 @@ packages:
|
|
|
|
url: "https://pub.dartlang.org"
|
|
|
|
url: "https://pub.dartlang.org"
|
|
|
|
source: hosted
|
|
|
|
source: hosted
|
|
|
|
version: "2.4.1"
|
|
|
|
version: "2.4.1"
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
barcode_scan:
|
|
|
|
barcode_scan:
|
|
|
|
dependency: "direct main"
|
|
|
|
dependency: "direct main"
|
|
|
|
description:
|
|
|
|
description:
|
|
|
|
@ -45,7 +43,6 @@ packages:
|
|
|
|
url: "https://pub.dartlang.org"
|
|
|
|
url: "https://pub.dartlang.org"
|
|
|
|
source: hosted
|
|
|
|
source: hosted
|
|
|
|
version: "3.0.1"
|
|
|
|
version: "3.0.1"
|
|
|
|
>>>>>>> 8f56c5104af4e78067c70eb1e034615f45fcf6fc
|
|
|
|
|
|
|
|
bazel_worker:
|
|
|
|
bazel_worker:
|
|
|
|
dependency: transitive
|
|
|
|
dependency: transitive
|
|
|
|
description:
|
|
|
|
description:
|
|
|
|
|