Resolved merge conflicts

2016-05-12 16:07:39 -07:00
parent cf9eb3f602
commit 433dd87e51
8 changed files with 59 additions and 19 deletions
--- a/platform/representation/src/gestures/DropGesture.js
+++ b/platform/representation/src/gestures/DropGesture.js
@@ -103,7 +103,6 @@ define(
                // the change.
                if (id) {
                    e.preventDefault();
-
                    if (domainObjectType!=='folder') {
                        domainObject.getCapability('action').perform('edit');
                    }