diff options
| author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
| commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
| tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Tests/Common/Mock/TestScene.cs | |
| parent | bad merge? (diff) | |
| download | opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz | |
seems to compile ( tests comented out)
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestScene.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index e559871..45acf91 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
| @@ -34,10 +34,7 @@ using OpenSim.Region.Framework; | |||
| 34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
| 35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
| 36 | using OpenSim.Region.Physics.Manager; | 36 | using OpenSim.Region.Physics.Manager; |
| 37 | <<<<<<< HEAD | ||
| 38 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
| 39 | ======= | ||
| 40 | >>>>>>> avn/ubitvar | ||
| 41 | 38 | ||
| 42 | namespace OpenSim.Tests.Common | 39 | namespace OpenSim.Tests.Common |
| 43 | { | 40 | { |