diff options
| author | John Ahlroos <john@vaadin.com> | 2014-08-07 16:32:23 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2014-08-07 16:35:06 +0300 |
| commit | ecff9648d1cb3d5cc4bd54d2b1e1c6357429792f (patch) | |
| tree | b21f4b599183c157900b0f24d41c94e6af3b08a7 /uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java | |
| parent | e5230e6a2433f5c8a74c66b73e96d0454866d316 (diff) | |
| parent | ff47bdd97b03a42dfc812b4dc9ad71fa45ce3827 (diff) | |
| download | vaadin-framework-ecff9648d1cb3d5cc4bd54d2b1e1c6357429792f.tar.gz vaadin-framework-ecff9648d1cb3d5cc4bd54d2b1e1c6357429792f.zip | |
Merge remote-tracking branch 'origin/master' into grid
Conflicts:
WebContent/release-notes.html
Change-Id: Ie05bea7142134a7a9d655fcdf6ca232fd13c742b
Diffstat (limited to 'uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java')
| -rw-r--r-- | uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java index 8a4593d70d..28ef30a04a 100644 --- a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java +++ b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.push; - public class ReconnectLongPollingTest extends ReconnectTest { @Override |