Skip to content

Commit 20abb7e

Browse files
committed
Add ../pubspec.lock due to merge conflict
1 parent a75d7e0 commit 20abb7e

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

pubspec.lock

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ packages:
4242
name: collection
4343
url: "https://pub.dartlang.org"
4444
source: hosted
45-
version: "1.15.0"
45+
version: "1.16.0"
4646
dio:
4747
dependency: "direct main"
4848
description:
@@ -63,7 +63,7 @@ packages:
6363
name: fake_async
6464
url: "https://pub.dartlang.org"
6565
source: hosted
66-
version: "1.2.0"
66+
version: "1.3.0"
6767
ffi:
6868
dependency: transitive
6969
description:
@@ -106,7 +106,7 @@ packages:
106106
name: js
107107
url: "https://pub.dartlang.org"
108108
source: hosted
109-
version: "0.6.3"
109+
version: "0.6.4"
110110
logging:
111111
dependency: transitive
112112
description:
@@ -121,6 +121,13 @@ packages:
121121
url: "https://pub.dartlang.org"
122122
source: hosted
123123
version: "0.12.11"
124+
material_color_utilities:
125+
dependency: transitive
126+
description:
127+
name: material_color_utilities
128+
url: "https://pub.dartlang.org"
129+
source: hosted
130+
version: "0.1.4"
124131
meta:
125132
dependency: transitive
126133
description:
@@ -134,7 +141,7 @@ packages:
134141
name: path
135142
url: "https://pub.dartlang.org"
136143
source: hosted
137-
version: "1.8.0"
144+
version: "1.8.1"
138145
path_provider_linux:
139146
dependency: transitive
140147
description:
@@ -244,7 +251,7 @@ packages:
244251
name: source_span
245252
url: "https://pub.dartlang.org"
246253
source: hosted
247-
version: "1.8.1"
254+
version: "1.8.2"
248255
stack_trace:
249256
dependency: transitive
250257
description:
@@ -279,7 +286,7 @@ packages:
279286
name: test_api
280287
url: "https://pub.dartlang.org"
281288
source: hosted
282-
version: "0.4.3"
289+
version: "0.4.9"
283290
typed_data:
284291
dependency: transitive
285292
description:
@@ -293,7 +300,7 @@ packages:
293300
name: vector_math
294301
url: "https://pub.dartlang.org"
295302
source: hosted
296-
version: "2.1.1"
303+
version: "2.1.2"
297304
win32:
298305
dependency: transitive
299306
description:
@@ -309,5 +316,5 @@ packages:
309316
source: hosted
310317
version: "0.2.0"
311318
sdks:
312-
dart: ">=2.14.0 <3.0.0"
319+
dart: ">=2.17.0-0 <3.0.0"
313320
flutter: ">=1.20.0"

0 commit comments

Comments
 (0)