]> source.dussan.org Git - vaadin-framework.git/commitdiff
Merge commit 'bce95bce91f80ddd228c96ab7b89770499b5e49e'
authorArtur Signell <artur@vaadin.com>
Thu, 27 Feb 2014 11:06:22 +0000 (13:06 +0200)
committerArtur Signell <artur@vaadin.com>
Thu, 27 Feb 2014 11:06:22 +0000 (13:06 +0200)
Conflicts:
uitest/src/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html

Change-Id: I03b12e474ee59a86aefcedfda24e55620eed717d

1  2 
uitest/src/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html

index 7c6f9ceb39ef3a24b548ed9c087afc7a47c3c278,57b267530c4e91c9080795e10551ef6395018d10..48d48ede806cca5fecb1a41dbe50ff8221c76ca4
@@@ -3,8 -3,8 +3,8 @@@
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  <head profile="http://selenium-ide.openqa.org/profiles/test-case">
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <link rel="selenium.base" href="http://localhost:88888/" />
+ <link rel="selenium.base" href="" />
 -<title>New Test</title>
 +<title>IntegerRangeValidator</title>
  </head>
  <body>
  <table cellpadding="1" cellspacing="1" border="1">