Resolved merge conflicts

2016-05-12 16:09:53 -07:00
parent 4b786d3536
commit d00e13e4ee
8 changed files with 10 additions and 10 deletions
--- a/platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDropHandler.js
+++ b/platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDropHandler.js
@@ -42,7 +42,7 @@ define(
            // Check if we are in edit mode (also check parents)
            function inEditMode(swimlane) {
                return swimlane.domainObject.hasCapability('editor') &&
-                    swimlane.domainObject.getCapability('editor').isEditing();
+                    swimlane.domainObject.getCapability('editor').inEditContext();
            }

            // Boolean and (for reduce below)