Resolve merge for keyword name change

Author: molsky

src/Selenium2Library/keywords/_waiting.py

@@ -175,4 +175,4 @@ def _wait_until_no_error(self, timeout, wait_func, *args):
 
     def _format_timeout(self, timeout):
         timeout = robot.utils.timestr_to_secs(timeout) if timeout is not None else self._timeout_in_secs
-        return robot.utils.secs_to_timestr(timeout)
+        return robot.utils.secs_to_timestr(timeout)

test/acceptance/keywords/waiting.txt

@@ -32,4 +32,5 @@ Wait Until Element Is Enabled
     Run Keyword And Expect Error  Element 'id=disabled' was not enabled in 100 milliseconds  Wait Until Element Is Enabled  id=disabled  0.1
     Wait Until Element Is Enabled  id=disabled  2 s
     Run Keyword And Expect Error  Element locator 'id=invalid' did not match any elements after 100 milliseconds  Wait Until Element Is Enabled  id=invalid  0.1
-    Run Keyword And Expect Error  User error message  Wait Until Element Is Enabled  id=invalid  0.1  User error message
+    Run Keyword And Expect Error  User error message  Wait Until Element Is Enabled  id=invalid  0.1  User error message
+