diff --git a/client/package.json b/client/package.json index b41a69d2443..901e1abb6f3 100644 --- a/client/package.json +++ b/client/package.json @@ -103,8 +103,12 @@ "vue-prismjs": "^1.2.0", "vue-router": "^3.6.5", "vue-rx": "^6.2.0", +<<<<<<< HEAD "vue-svg-pan-zoom": "1.1.0", "vue-virtual-scroll-list": "^2.3.4", +======= + "vue-virtual-scroll-list": "^2.3.3", +>>>>>>> 21d8fc90d6 (Cleanup unused remains) "vuedraggable": "2.24.3", "vuex": "^3.6.2", "vuex-cache": "^3.4.0", diff --git a/client/src/components/Workflow/Editor/D3Zoom.vue b/client/src/components/Workflow/Editor/D3Zoom.vue index f940dbe911d..8bfc3f88c9e 100644 --- a/client/src/components/Workflow/Editor/D3Zoom.vue +++ b/client/src/components/Workflow/Editor/D3Zoom.vue @@ -1,6 +1,6 @@