diff options
| author | Artur Signell <artur@vaadin.com> | 2012-04-04 16:29:17 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-04-05 00:09:34 +0300 |
| commit | 824176cc33d61fd087ab32f0db6005d26a3871d2 (patch) | |
| tree | 3096f29a13c98e1f0dc3d49a8e32eaaf1574180b /tests/testbench | |
| parent | 2c683e387292aff6c2a70cba003f970d28c40d31 (diff) | |
| download | vaadin-framework-824176cc33d61fd087ab32f0db6005d26a3871d2.tar.gz vaadin-framework-824176cc33d61fd087ab32f0db6005d26a3871d2.zip | |
Fixed merge problem from ef53ac075f83a865cbc6e736132821d8b1714aab
Diffstat (limited to 'tests/testbench')
| -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; |