From 15c5f10ea4d3ccccc7089ec0c1ccb5f8f0a3a58c Mon Sep 17 00:00:00 2001 From: Matthew Fosse <matt@fosse.co> Date: Mon, 6 May 2024 13:10:56 -0700 Subject: [PATCH] [skip ci] merge conflict fixes --- cw_bitcoin/pubspec.yaml | 6 ------ cw_bitcoin_cash/pubspec.yaml | 6 ------ cw_evm/pubspec.yaml | 3 --- cw_haven/pubspec.yaml | 6 ------ cw_monero/pubspec.yaml | 6 ------ cw_nano/pubspec.yaml | 6 ------ 6 files changed, 33 deletions(-) diff --git a/cw_bitcoin/pubspec.yaml b/cw_bitcoin/pubspec.yaml index 4db7e8e8d..f6dab6d43 100644 --- a/cw_bitcoin/pubspec.yaml +++ b/cw_bitcoin/pubspec.yaml @@ -51,12 +51,6 @@ dev_dependencies: dependency_overrides: watcher: ^1.1.0 -dependency_overrides: - watcher: ^1.1.0 - -dependency_overrides: - watcher: ^1.1.0 - # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/cw_bitcoin_cash/pubspec.yaml b/cw_bitcoin_cash/pubspec.yaml index 38ba8ed6c..b94671b31 100644 --- a/cw_bitcoin_cash/pubspec.yaml +++ b/cw_bitcoin_cash/pubspec.yaml @@ -46,12 +46,6 @@ dev_dependencies: dependency_overrides: watcher: ^1.1.0 -dependency_overrides: - watcher: ^1.1.0 - -dependency_overrides: - watcher: ^1.1.0 - # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/cw_evm/pubspec.yaml b/cw_evm/pubspec.yaml index 6925b9ac7..4cf43b676 100644 --- a/cw_evm/pubspec.yaml +++ b/cw_evm/pubspec.yaml @@ -46,9 +46,6 @@ dev_dependencies: hive_generator: ^2.0.1 flutter_lints: ^2.0.0 -dependency_overrides: - watcher: ^1.1.0 - flutter: # assets: # - images/a_dot_burr.jpeg diff --git a/cw_haven/pubspec.yaml b/cw_haven/pubspec.yaml index ba7304d2b..290e1f618 100644 --- a/cw_haven/pubspec.yaml +++ b/cw_haven/pubspec.yaml @@ -32,12 +32,6 @@ dev_dependencies: dependency_overrides: watcher: ^1.1.0 -dependency_overrides: - watcher: ^1.1.0 - -dependency_overrides: - watcher: ^1.1.0 - # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/cw_monero/pubspec.yaml b/cw_monero/pubspec.yaml index 5fe7a9935..92fb251a3 100644 --- a/cw_monero/pubspec.yaml +++ b/cw_monero/pubspec.yaml @@ -34,12 +34,6 @@ dev_dependencies: dependency_overrides: watcher: ^1.1.0 -dependency_overrides: - watcher: ^1.1.0 - -dependency_overrides: - watcher: ^1.1.0 - # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/cw_nano/pubspec.yaml b/cw_nano/pubspec.yaml index 7ca39d69e..f65aac23b 100644 --- a/cw_nano/pubspec.yaml +++ b/cw_nano/pubspec.yaml @@ -39,12 +39,6 @@ dev_dependencies: dependency_overrides: watcher: ^1.1.0 -dependency_overrides: - watcher: ^1.1.0 - -dependency_overrides: - watcher: ^1.1.0 - # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec