Skip to content

Commit 254806e

Browse files
committed
run telemetry extract
1 parent ea3db21 commit 254806e

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

src/plugins/telemetry/schema/oss_plugins.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
}
4949
}
5050
},
51-
<<<<<<< HEAD
52-
=======
5351
"application_usage": {
5452
"properties": {
5553
"dashboards": {
@@ -1286,7 +1284,6 @@
12861284
}
12871285
}
12881286
},
1289-
>>>>>>> 0fd503edc61dcdc1ea95d1941cb198fa63c64e03
12901287
"csp": {
12911288
"properties": {
12921289
"strict": {

0 commit comments

Comments
 (0)