Merge with master

dart-lang · Jul 5, 2023 · 2cee1fd · 2cee1fd
2 parents a0a5d82 + b672e98
commit 2cee1fd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart
diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml
@@ -1,6 +1,10 @@
 name: dwds
 # Every time this changes you need to run `dart run build_runner build`.
+<<<<<<< HEAD
 version: 20.0.0-wip
+=======
+version: 19.0.3-wip
+>>>>>>> b672e98a4f1071bace009da84b6544151977a2b6
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM
   service protocol.

diff --git a/dwds/ignore_pubspec_overrides.yaml → dwds/pubspec_overrides.yaml b/dwds/ignore_pubspec_overrides.yaml → dwds/pubspec_overrides.yaml