File tree Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Original file line number Diff line number Diff line change @@ -57,7 +57,11 @@ dependencies:
57
57
http_multi_server : 3.2.1
58
58
convert : 3.1.1
59
59
async : 2.11.0
60
+ <<<<<<< HEAD
60
61
unified_analytics : 5.8.8+1
62
+ =======
63
+ unified_analytics : 5.8.0+1
64
+ >>>>>>> 7482962148 ([CP-stable] Bump hotfix version for `package:unified_analytics` (#143885))
61
65
62
66
cli_config : 0.2.0
63
67
graphs : 2.3.1
@@ -125,8 +129,12 @@ dartdoc:
125
129
# Exclude this package from the hosted API docs.
126
130
nodoc : true
127
131
132
+ <<<<<<< HEAD
128
133
<<<<<<< HEAD
129
134
# PUBSPEC CHECKSUM: 067f
130
135
=======
131
136
# PUBSPEC CHECKSUM: 45be
132
137
>>>>>>> 71680ed0fe (CP: [Beta] Update DWDS to version 23.0.0+1 (#142168))
138
+ =======
139
+ # PUBSPEC CHECKSUM: a81b
140
+ >>>>>>> 7482962148 ([CP-stable] Bump hotfix version for `package:unified_analytics` (#143885))
You can’t perform that action at this time.
0 commit comments