diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-10-17 13:01:58 +0000 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-10-17 13:01:58 +0000 |
| commit | 7c06bfa1605de089f30b7d622bf8c9ed2e0d34ae (patch) | |
| tree | fded340ffbeb7d17bc60a5e906946232c14f1058 /build/bin/mergetool.py | |
| parent | 06c008c2fba30a5165147686c9e677e4a69f9987 (diff) | |
| download | vaadin-framework-7c06bfa1605de089f30b7d622bf8c9ed2e0d34ae.tar.gz vaadin-framework-7c06bfa1605de089f30b7d622bf8c9ed2e0d34ae.zip | |
Moved the integration test sleep so that it isn't in effect if only running the integration tests
svn changeset:21718/svn branch:6.7
Diffstat (limited to 'build/bin/mergetool.py')
0 files changed, 0 insertions, 0 deletions