Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-01-05 10:29:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge conflicts

Browse source
This commit is contained in:
Matthew Fosse 2024-05-06 09:29:11 -07:00
parent 28f5dccebb
commit d22700c9e0
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cw_ethereum/pubspec.yaml
View file

@ -24,15 +24,13 @@ dependency_overrides:
git: git:
url: https://github.com/cake-tech/web3dart.git url: https://github.com/cake-tech/web3dart.git
ref: cake ref: cake
watcher: ^1.1.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter
build_runner: ^2.4.7 build_runner: ^2.4.7
dependency_overrides:
watcher: ^1.1.0
flutter: flutter:
# assets: # assets:
# - images/a_dot_burr.jpeg # - images/a_dot_burr.jpeg

4
cw_evm/pubspec.yaml
View file

@ -36,6 +36,7 @@ dependency_overrides:
git: git:
url: https://github.com/cake-tech/ledger-flutter.git url: https://github.com/cake-tech/ledger-flutter.git
ref: cake ref: cake
watcher: ^1.1.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
@ -45,9 +46,6 @@ dev_dependencies:
hive_generator: ^1.1.3 hive_generator: ^1.1.3
flutter_lints: ^2.0.0 flutter_lints: ^2.0.0
dependency_overrides:
watcher: ^1.1.0
flutter: flutter:
# assets: # assets:
# - images/a_dot_burr.jpeg # - images/a_dot_burr.jpeg

3
cw_polygon/pubspec.yaml
View file

@ -28,6 +28,7 @@ dependency_overrides:
git: git:
url: https://github.com/cake-tech/web3dart.git url: https://github.com/cake-tech/web3dart.git
ref: cake ref: cake
watcher: ^1.1.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
@ -35,8 +36,6 @@ dev_dependencies:
flutter_lints: ^2.0.0 flutter_lints: ^2.0.0
build_runner: ^2.4.7 build_runner: ^2.4.7
dependency_overrides:
watcher: ^1.1.0
# For information on the generic Dart part of this file, see the # For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec # following page: https://dart.dev/tools/pub/pubspec