fix conflict (#32845)

elastic · Aug 30, 2022 · 2e2d972 · 2e2d972
1 parent 37a52cf
commit 2e2d972
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/x-pack/libbeat/processors/add_cloudfoundry_metadata/_meta/fields.yml b/x-pack/libbeat/processors/add_cloudfoundry_metadata/_meta/fields.yml
@@ -71,4 +71,3 @@
               type: keyword
               description: >
                 Name of the deployment that created this event.
->>>>>>> origin/7.x