File tree Expand file tree Collapse file tree 3 files changed +8
-12
lines changed Expand file tree Collapse file tree 3 files changed +8
-12
lines changed Original file line number Diff line number Diff line change @@ -28,11 +28,7 @@ packages:
28
28
name: async
29
29
url: "https://pub.dartlang.org"
30
30
source: hosted
31
- <<<<<<< HEAD
32
31
version: "2.8.2"
33
- =======
34
- version: "2.6.1"
35
- >>>>>>> d5e1c1ebf920209a1c29c78abad7fe6d66527f8e
36
32
bloc:
37
33
dependency: "direct main"
38
34
description:
@@ -123,7 +119,7 @@ packages:
123
119
name: charcode
124
120
url: "https://pub.dartlang.org"
125
121
source: hosted
126
- version: "1.2.0 "
122
+ version: "1.3.1 "
127
123
checked_yaml:
128
124
dependency: transitive
129
125
description:
@@ -434,7 +430,7 @@ packages:
434
430
name: meta
435
431
url: "https://pub.dartlang.org"
436
432
source: hosted
437
- version: "1.3 .0"
433
+ version: "1.7 .0"
438
434
mime:
439
435
dependency: transitive
440
436
description:
@@ -714,25 +710,21 @@ packages:
714
710
name: test
715
711
url: "https://pub.dartlang.org"
716
712
source: hosted
717
- version: "1.16.8 "
713
+ version: "1.17.10 "
718
714
test_api:
719
715
dependency: transitive
720
716
description:
721
717
name: test_api
722
718
url: "https://pub.dartlang.org"
723
719
source: hosted
724
- <<<<<<< HEAD
725
720
version: "0.4.2"
726
- =======
727
- version: "0.3.0"
728
721
test_core:
729
722
dependency: transitive
730
723
description:
731
724
name: test_core
732
725
url: "https://pub.dartlang.org"
733
726
source: hosted
734
- version: "0.3.19"
735
- >>>>>>> d5e1c1ebf920209a1c29c78abad7fe6d66527f8e
727
+ version: "0.4.0"
736
728
timing:
737
729
dependency: transitive
738
730
description:
Original file line number Diff line number Diff line change 2
2
// Generated file. Do not edit.
3
3
//
4
4
5
+ // clang-format off
6
+
5
7
#include " generated_plugin_registrant.h"
6
8
7
9
#include < file_selector_windows/file_selector_plugin.h>
Original file line number Diff line number Diff line change 2
2
// Generated file. Do not edit.
3
3
//
4
4
5
+ // clang-format off
6
+
5
7
#ifndef GENERATED_PLUGIN_REGISTRANT_
6
8
#define GENERATED_PLUGIN_REGISTRANT_
7
9
You can’t perform that action at this time.
0 commit comments