diff options
Diffstat (limited to 'OpenSim/Framework/Servers/Tests')
-rw-r--r-- | OpenSim/Framework/Servers/Tests/OSHttpTests.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs index e13551c..1b47cc6 100644 --- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs +++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs | |||
@@ -41,9 +41,6 @@ namespace OpenSim.Framework.Servers.Tests | |||
41 | { | 41 | { |
42 | [TestFixture] | 42 | [TestFixture] |
43 | public class OSHttpTests : OpenSimTestCase | 43 | public class OSHttpTests : OpenSimTestCase |
44 | <<<<<<< HEAD | ||
45 | { | ||
46 | ======= | ||
47 | { | 44 | { |
48 | // we need an IHttpClientContext for our tests | 45 | // we need an IHttpClientContext for our tests |
49 | public class TestHttpClientContext: IHttpClientContext | 46 | public class TestHttpClientContext: IHttpClientContext |
@@ -363,9 +360,8 @@ namespace OpenSim.Framework.Servers.Tests | |||
363 | public void Redirect(Uri uri) {} | 360 | public void Redirect(Uri uri) {} |
364 | public void Redirect(string url) {} | 361 | public void Redirect(string url) {} |
365 | } | 362 | } |
363 | |||
366 | 364 | ||
367 | |||
368 | >>>>>>> avn/ubitvar | ||
369 | public OSHttpRequest req0; | 365 | public OSHttpRequest req0; |
370 | public OSHttpRequest req1; | 366 | public OSHttpRequest req1; |
371 | 367 | ||