From: Artur Signell <artur@vaadin.com>
Date: Wed, 4 Apr 2012 13:29:17 +0000 (+0300)
Subject: Fixed merge problem from ef53ac075f83a865cbc6e736132821d8b1714aab
X-Git-Tag: 7.0.0.alpha2~129
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=824176cc33d61fd087ab32f0db6005d26a3871d2;p=vaadin-framework.git

Fixed merge problem from ef53ac075f83a865cbc6e736132821d8b1714aab
---

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;