]> source.dussan.org Git - vaadin-framework.git/commit
Fixed merge problem from ef53ac075f83a865cbc6e736132821d8b1714aab
authorArtur Signell <artur@vaadin.com>
Wed, 4 Apr 2012 13:29:17 +0000 (16:29 +0300)
committerArtur Signell <artur@vaadin.com>
Wed, 4 Apr 2012 21:09:34 +0000 (00:09 +0300)
commit824176cc33d61fd087ab32f0db6005d26a3871d2
tree3096f29a13c98e1f0dc3d49a8e32eaaf1574180b
parent2c683e387292aff6c2a70cba003f970d28c40d31
Fixed merge problem from ef53ac075f83a865cbc6e736132821d8b1714aab
tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java