diff options
| -rw-r--r-- | tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java index 6299eac14f..02ed47ec05 100644 --- a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java +++ b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java @@ -9,8 +9,6 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; - -<<<<<<< HEAD import com.vaadin.terminal.gwt.client.ui.Component; import com.vaadin.tests.dd.CustomDDImplementation.MyDropTarget; |