From 2a71c2ab7926beb1828595dd16f4f625c78b7901 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 19 May 2020 12:48:19 +0300 Subject: [PATCH] fix merge --- pubspec.lock | 3 --- 1 file changed, 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 68d7f4e0..9b4511ab 100644 --- 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: