From f19b6002875f1898ad38c4e30a43e3a8143fb26f Mon Sep 17 00:00:00 2001
From: Robert <robertbrignull@github.com>
Date: Mon, 17 Jul 2023 11:07:10 +0100
Subject: [PATCH] Fix semantic merge conflict in imports

---
 .../src/data-extensions-editor/data-extensions-editor-view.ts    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts
index 23e0a813a..7f05ec5d3 100644
--- a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts
+++ b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts
@@ -43,6 +43,7 @@ import { enableFrameworkMode, showLlmGeneration } from "../config";
 import { getAutoModelUsages } from "./auto-model-usages-query";
 import { Mode } from "./shared/mode";
 import { loadModeledMethods, saveModeledMethods } from "./modeled-method-fs";
+import { join } from "path";
 
 export class DataExtensionsEditorView extends AbstractWebview<
   ToDataExtensionsEditorMessage,