fix merge conflict

elastic · Apr 29, 2020 · d6552e2 · d6552e2
1 parent 47d4577
commit d6552e2
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/legacy/server/kbn_server.d.ts b/src/legacy/server/kbn_server.d.ts
@@ -153,6 +153,7 @@ export default class KbnServer {
   public server: Server;
   public inject: Server['inject'];
   public pluginSpecs: any[];
+  public uiBundles: any;
 
   constructor(
     settings: Record<string, any>,