update fields

elastic · Jan 29, 2019 · d9a7c5d · d9a7c5d
1 parent a19d4ce
commit d9a7c5d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -18931,13 +18931,9 @@ The request method (GET, POST, etc) (of the current request)
 *`php_fpm.process.request_uri`*::
 +
 --
-<<<<<<< HEAD
 type: alias
 
 alias to: url.original
-=======
-type: keyword
->>>>>>> Change text fields to keyword
 
 The request URI with the query string (of the current request)