ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

seems to compile ( tests comented out)

Browse Source
This commit is contained in:
UbitUmarov
2015-09-02 19:54:53 +01:00
parent 371c9dd2af
commit a11edceb00
157 changed files with 1315 additions and 9792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Servers/Tests/OSHttpTests.cs
View File

@@ -41,9 +41,6 @@ namespace OpenSim.Framework.Servers.Tests
{
[TestFixture]
public class OSHttpTests : OpenSimTestCase
<<<<<<< HEAD
{
=======
{
// we need an IHttpClientContext for our tests
public class TestHttpClientContext: IHttpClientContext
@@ -363,9 +360,8 @@ namespace OpenSim.Framework.Servers.Tests
public void Redirect(Uri uri) {}
public void Redirect(string url) {}
}
>>>>>>> avn/ubitvar
public OSHttpRequest req0;
public OSHttpRequest req1;