Fixed conflicts

Author: marcnjaramillo

extensions/ql-vscode/src/cli.ts

@@ -676,7 +676,6 @@ export class CodeQLCliServer implements Disposable {
 
   async interpretBqrs(metadata: QueryMetadata, resultsPath: string, interpretedResultsPath: string, sourceInfo?: SourceInfo): Promise<sarif.Log> {
     await this.runInterpretCommand(SARIF_FORMAT, metadata, resultsPath, interpretedResultsPath, sourceInfo);
-
     try {
       //TODO: figure out error handling for Assembler
       return await new Promise((resolve) => {
@@ -1144,4 +1143,4 @@ export class CliVersionConstraint {
     return this.isVersionAtLeast(CliVersionConstraint.CLI_VERSION_WITH_DATABASE_UNBUNDLE);
   }
 
-}
+}