Skip to content

Commit 5058fd9

Browse files
conflict
1 parent 4f63642 commit 5058fd9

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

pubspec.lock

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@ packages:
2828
name: async
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
<<<<<<< HEAD
3231
version: "2.8.2"
33-
=======
34-
version: "2.6.1"
35-
>>>>>>> d5e1c1ebf920209a1c29c78abad7fe6d66527f8e
3632
bloc:
3733
dependency: "direct main"
3834
description:
@@ -123,7 +119,7 @@ packages:
123119
name: charcode
124120
url: "https://pub.dartlang.org"
125121
source: hosted
126-
version: "1.2.0"
122+
version: "1.3.1"
127123
checked_yaml:
128124
dependency: transitive
129125
description:
@@ -434,7 +430,7 @@ packages:
434430
name: meta
435431
url: "https://pub.dartlang.org"
436432
source: hosted
437-
version: "1.3.0"
433+
version: "1.7.0"
438434
mime:
439435
dependency: transitive
440436
description:
@@ -714,25 +710,21 @@ packages:
714710
name: test
715711
url: "https://pub.dartlang.org"
716712
source: hosted
717-
version: "1.16.8"
713+
version: "1.17.10"
718714
test_api:
719715
dependency: transitive
720716
description:
721717
name: test_api
722718
url: "https://pub.dartlang.org"
723719
source: hosted
724-
<<<<<<< HEAD
725720
version: "0.4.2"
726-
=======
727-
version: "0.3.0"
728721
test_core:
729722
dependency: transitive
730723
description:
731724
name: test_core
732725
url: "https://pub.dartlang.org"
733726
source: hosted
734-
version: "0.3.19"
735-
>>>>>>> d5e1c1ebf920209a1c29c78abad7fe6d66527f8e
727+
version: "0.4.0"
736728
timing:
737729
dependency: transitive
738730
description:

windows/flutter/generated_plugin_registrant.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Generated file. Do not edit.
33
//
44

5+
// clang-format off
6+
57
#include "generated_plugin_registrant.h"
68

79
#include <file_selector_windows/file_selector_plugin.h>

windows/flutter/generated_plugin_registrant.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Generated file. Do not edit.
33
//
44

5+
// clang-format off
6+
57
#ifndef GENERATED_PLUGIN_REGISTRANT_
68
#define GENERATED_PLUGIN_REGISTRANT_
79

0 commit comments

Comments
 (0)