From e962eccccbb3512105dd27323ec888d5bd0edd78 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Thu, 26 Jan 2023 21:05:23 +0100 Subject: [PATCH] Fix botched merge --- src/modules/Elsa.Workflows.Designer/package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/modules/Elsa.Workflows.Designer/package.json b/src/modules/Elsa.Workflows.Designer/package.json index b5020f438..f3a8adb43 100644 --- a/src/modules/Elsa.Workflows.Designer/package.json +++ b/src/modules/Elsa.Workflows.Designer/package.json @@ -6,11 +6,7 @@ "build:debug": "cross-env webpack --mode=development --env configuration=Debug" }, "devDependencies": { -<<<<<<< HEAD "@elsa-workflows/elsa-workflows-designer": "^3.0.2-preview.47", -======= - "@elsa-workflows/elsa-workflows-designer": "^3.0.2-preview.46", ->>>>>>> v3 "copy-webpack-plugin": "^11.0.0", "cross-env": "^7.0.3", "monaco-editor": "^0.34.1",