run telemetry extract

elastic · Sep 14, 2020 · 254806e · 254806e
1 parent ea3db21
commit 254806e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
@@ -48,8 +48,6 @@
         }
       }
     },
-<<<<<<< HEAD
-=======
     "application_usage": {
       "properties": {
         "dashboards": {
@@ -1286,7 +1284,6 @@
         }
       }
     },
->>>>>>> 0fd503edc61dcdc1ea95d1941cb198fa63c64e03
     "csp": {
       "properties": {
         "strict": {