Fix merge conflicts.

elastic · Dec 21, 2019 · 71eb5ce · 71eb5ce
1 parent 9ed6d28
commit 71eb5ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/...ugins/kibana/public/discover/np_ready/angular/context/api/utils/fetch_hits_in_interval.ts b/...ugins/kibana/public/discover/np_ready/angular/context/api/utils/fetch_hits_in_interval.ts
@@ -16,16 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  EsQuerySortValue,
-  SortDirection,
-<<<<<<< HEAD:src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/fetch_hits_in_interval.ts
-  SearchSourceContract,
-} from '../../../../../kibana_services';
-=======
-  ISearchSource,
-} from '../../../../../../../../ui/public/courier';
->>>>>>> Rename SearchSourceContract -> ISearchSource.:src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/fetch_hits_in_interval.ts
+import { EsQuerySortValue, SortDirection, ISearchSource } from '../../../../../kibana_services';
 import { convertTimeValueToIso } from './date_conversion';
 import { EsHitRecordList } from '../context';
 import { IntervalValue } from './generate_intervals';

diff --git a/src/legacy/ui/public/saved_objects/types.ts b/src/legacy/ui/public/saved_objects/types.ts
@@ -24,7 +24,7 @@ import {
   SavedObjectAttributes,
   SavedObjectReference,
 } from 'kibana/public';
-import { SearchSource, ISearchSource } from 'ui/courier';
+import { ISearchSource } from 'ui/courier';
 import { IIndexPattern, IndexPatternsContract } from '../../../../plugins/data/public';
 
 export interface SavedObject {