Fixing the build - Removing some extra lines that occured on merging.

Ognjen Sobajic · Ognjen Sobajic · commit cc3fac5d865a · 2013-07-29T00:22:19.000-07:00
diff --git a/Release/tests/Functional/http/client/connections_and_errors.cpp b/Release/tests/Functional/http/client/connections_and_errors.cpp
@@ -122,10 +122,6 @@ TEST_FIXTURE(uri_address, server_close_without_responding,
     VERIFY_THROWS_HTTP_ERROR_CODE(client.request(methods::GET).wait(), std::errc::host_unreachable);
 }
 
-<<<<<<< HEAD
-// This test hangs or crashes intermittently on Linux
-=======
->>>>>>> d6fa40eca4908abacf667b3865e894f393a15c4f
 TEST_FIXTURE(uri_address, request_timeout)
 {
     test_http_server::scoped_server scoped(m_uri);

Original file line number	Diff line number	Diff line change
`@@ -122,10 +122,6 @@ TEST_FIXTURE(uri_address, server_close_without_responding,`
`122`	`122`	`VERIFY_THROWS_HTTP_ERROR_CODE(client.request(methods::GET).wait(), std::errc::host_unreachable);`
`123`	`123`	`}`
`124`	`124`
`125`		`-<<<<<<< HEAD`
`126`		`-// This test hangs or crashes intermittently on Linux`
`127`		`-=======`
`128`		`->>>>>>> d6fa40eca4908abacf667b3865e894f393a15c4f`
`129`	`125`	`TEST_FIXTURE(uri_address, request_timeout)`
`130`	`126`	`{`
`131`	`127`	`test_http_server::scoped_server scoped(m_uri);`