fix commited merge conflict in docs (elastic#81042)

justinkambic · Oct 19, 2020 · b370047 · b370047
1 parent ebac90b
commit b370047
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/...t/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.md b/...t/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternsservice.md
@@ -43,10 +43,6 @@ export declare class IndexPatternsService
 |  [createAndSave(spec, override, skipFetchFields)](./kibana-plugin-plugins-data-public.indexpatternsservice.createandsave.md) |  | Create a new index pattern and save it right away |
 |  [createSavedObject(indexPattern, override)](./kibana-plugin-plugins-data-public.indexpatternsservice.createsavedobject.md) |  | Save a new index pattern |
 |  [delete(indexPatternId)](./kibana-plugin-plugins-data-public.indexpatternsservice.delete.md) |  | Deletes an index pattern from .kibana index |
-<<<<<<< HEAD
 |  [migrate(indexPattern, newTitle)](./kibana-plugin-plugins-data-public.indexpatternsservice.migrate.md) |  |  |
-|  [updateSavedObject(indexPattern, saveAttempts)](./kibana-plugin-plugins-data-public.indexpatternsservice.updatesavedobject.md) |  | Save existing index pattern. Will attempt to merge differences if there are conflicts |
-=======
 |  [updateSavedObject(indexPattern, saveAttempts, ignoreErrors)](./kibana-plugin-plugins-data-public.indexpatternsservice.updatesavedobject.md) |  | Save existing index pattern. Will attempt to merge differences if there are conflicts |
->>>>>>> cdb922f2a2... Move indexPattern.popularizeField into discover (#77668)