resolve conflicts around field chooser

elastic · Dec 20, 2019 · 99bf968 · 99bf968
1 parent 9c93bf4
commit 99bf968
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 122 deletions.
diff --git a/..._plugins/kibana/public/discover/np_ready/components/field_chooser/change_indexpattern.tsx b/..._plugins/kibana/public/discover/np_ready/components/field_chooser/change_indexpattern.tsx
diff --git a/..._chooser/discover_index_pattern_title.tsx → ..._chooser/discover_index_pattern_title.tsx b/..._chooser/discover_index_pattern_title.tsx → ..._chooser/discover_index_pattern_title.tsx