Fix api report

Signed-off-by: Johan Haals <johan.haals@gmail.com>
2023-09-13 14:26:41 +02:00
parent e753c3f27b
commit 6b13158471
1 changed files with 1 additions and 4 deletions
@@ -6,11 +6,8 @@
 import { BackstagePlugin } from '@backstage/frontend-plugin-api';
 import { Config } from '@backstage/config';
 import { ConfigApi } from '@backstage/core-plugin-api';
-<<<<<<< HEAD
-import { JSX as JSX_2 } from 'react';
-=======
 import { ExtensionDataRef } from '@backstage/frontend-plugin-api';
->>>>>>> ed3fd70bda19 (frontend-app-api: Add Extension utilities)
+import { JSX as JSX_2 } from 'react';

 // @public (undocumented)
 export function createApp(options: {