[skip ci] merge conflict fixes

This commit is contained in:
Matthew Fosse 2024-05-06 13:10:56 -07:00
parent 4c73dec92f
commit 15c5f10ea4
6 changed files with 0 additions and 33 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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