Fixing type woes in reportin'

elastic · Jan 17, 2020 · c46c8e4 · c46c8e4
1 parent 0aeb51b
commit c46c8e4
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/x-pack/legacy/plugins/reporting/types.d.ts b/x-pack/legacy/plugins/reporting/types.d.ts
@@ -340,8 +340,6 @@ export interface AbsoluteURLFactoryOptions {
   hostname: string;
   port: string | number;
 }
-<<<<<<< HEAD
-=======
 
 export interface InterceptedRequest {
   requestId: string;
@@ -359,4 +357,3 @@ export interface InterceptedRequest {
 }
 
 export { ServerFacade };
->>>>>>> e8b859bf2f... [Reporting] Fix map tiles not loading by using Chrome's Remote Protocol (#55137)