Fix merge conflict

eclipsesource · Sep 18, 2019 · 07008a3 · 07008a3
1 parent 2817d55
commit 07008a3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/client/packages/sprotty-client/src/model-source/websocket-diagram-server.ts b/client/packages/sprotty-client/src/model-source/websocket-diagram-server.ts
@@ -19,7 +19,7 @@ import {
     CollapseExpandAction, CollapseExpandAllAction,
     ComputedBoundsAction, DiagramServer, ExportSvgAction, ICommand, LayoutAction,
     OpenAction, RequestBoundsCommand, RequestModelAction, RequestPopupModelAction,
-    ServerStatusAction, SwitchEditModeCommand
+    ServerStatusAction, SwitchEditModeCommand, ApplyLabelEditAction
 } from "sprotty";
 import * as rpc from "vscode-ws-jsonrpc";
 import { NotificationType } from "vscode-ws-jsonrpc";
@@ -100,6 +100,7 @@ export function registerDefaultGLSPServerActions(registry: ActionHandlerRegistry
     registry.register(IdentifiableRequestAction.KIND, diagramServer);
     registry.register(RequestMarkersAction.KIND, diagramServer);
     registry.register(LayoutAction.KIND, diagramServer);
+    registry.register(ApplyLabelEditAction.KIND, diagramServer);
     registry.register(SaveModelEdgesAction.KIND, diagramServer);
 
     // Register an empty handler for SwitchEditMode, to avoid runtime exceptions.