Fix conflicts

elastic · Jun 8, 2021 · 7c0bc82 · 7c0bc82
1 parent 30bf8c2
commit 7c0bc82
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 36 deletions.
diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
diff --git a/include/fields.go b/include/fields.go