Skip to content

Commit

Permalink
Merge branch 'master' into chore/merge_master
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/syrius_builder.yml
#	lib/embedded_node/blobs/libznn.dll
#	lib/embedded_node/blobs/libznn.dylib
#	lib/embedded_node/blobs/libznn.so
#	lib/main.dart
#	lib/utils/clipboard_utils.dart
#	lib/utils/constants.dart
#	lib/utils/extensions.dart
#	lib/utils/global.dart
#	lib/widgets/main_app_container.dart
#	lib/widgets/modular_widgets/bridge_widgets/swap_card.dart
#	macos/Runner.xcodeproj/project.pbxproj
#	pubspec.lock
#	pubspec.yaml
#	windows/runner/Runner.rc
  • Loading branch information
vilkris4 committed Sep 17, 2023
2 parents 33eae06 + 8fec856 commit e499be1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
13 changes: 0 additions & 13 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -401,14 +401,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "5.0.1"
fake_async:
dependency: transitive
description:
name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
ffi:
dependency: "direct main"
description:
Expand Down Expand Up @@ -542,11 +534,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.7"
flutter_test:
dependency: "direct dev"
description: flutter
source: sdk
version: "0.0.0"
flutter_vector_icons:
dependency: "direct main"
description:
Expand Down
3 changes: 0 additions & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,7 @@ dependencies:
wallet_connect_uri_validator: ^0.1.0
big_decimal: ^0.5.0
ai_barcode_scanner: ^0.0.7

dev_dependencies:
flutter_test:
sdk: flutter
build_runner: ^2.1.7
hive_generator: ^2.0.0
flutter_lints: ^2.0.1
Expand Down

0 comments on commit e499be1

Please sign in to comment.