Resolve bad merge

core/frontend/src/CheckpointConnection.ts

@@ -79,39 +79,6 @@ export class CheckpointConnection extends IModelConnection {
     return connection;
   }
 
-  /**
-   * Open a readonly IModelConnection to a Checkpoint of an iModel from Ipc.
-   */
-  public static async openFromIpc(args: OpenCheckpointArgs): Promise<CheckpointConnection> {
-    if (undefined === IModelApp.hubAccess)
-      throw new Error("Missing an implementation of IModelApp.hubAccess");
-
-    // IModelRpcOpenProps.changeset requires id to be present
-    if (undefined === args.changeset?.id)
-      throw new Error("Missing changeset id");
-
-    let connection: CheckpointConnection;
-    if (IpcApp.isValid) {
-      connection = new this(await IpcApp.appFunctionIpc.openCheckpoint(args), true);
-    } else {
-      const routingContext = IModelRoutingContext.current || IModelRoutingContext.default;
-      connection = new this(await this.callOpen({
-        iModelId: args.iModelId,
-        iTwinId: args.iTwinId,
-        changeset: {
-          id: args.changeset.id,
-          index: args.changeset?.index,
-        },
-      }, routingContext), false);
-      RpcManager.setIModel(connection);
-      connection.routingContext = routingContext;
-      RpcRequest.notFoundHandlers.addListener(connection._reopenConnectionHandler);
-    }
-
-    IModelConnection.onOpen.raiseEvent(connection);
-    return connection;
-  }
-
   private static async callOpen(iModelToken: IModelRpcOpenProps, routingContext: IModelRoutingContext): Promise<IModelConnectionProps> {
     // Try opening the iModel repeatedly accommodating any pending responses from the backend.
     // Waits for an increasing amount of time (but within a range) before checking on the pending request again.