Ha, so it is.. Better fix that.

Sent from my Windows Phone
________________________________
From: Robert Moore<mailto:notifications@github.com>
Sent: ý29/ý07/ý2013 14:48
To: TestStack/TestStack.docs<mailto:TestStack.docs@noreply.github.com>
Cc: Jake Ginnivan<mailto:Jake.Ginnivan@readify.net>
Subject: Re: [TestStack.docs] More write docs (#13)


In _source/White/Advanced Topics/Waiting.md:

> @@ -31,6 +31,27 @@ Implement the interface White.Core.Configuration.IWaitHook.
>  Implement the WaitFor method in it to wait for as long as your test requires. White passed in the UIItemContainer (most of the time this is just the window) object to provide the context of call. e.g. you can wait till you can find a UI Item in this container.
>  Set the wait hook by setting CoreAppXmlConfiguration.Instance.AdditionalWaitHook value
>
> +<<<<<<< HEAD


is this a merge conflict marker?

—
Reply to this email directly or view it on GitHub<https://github.com/TestStack/TestStack.docs/pull/13/files#r5449799>.