diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs index 13d0140..724c2a9 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs | |||
| @@ -51,7 +51,7 @@ namespace OpenSim | |||
| 51 | 51 | ||
| 52 | public void Microthread(IEnumerable thread) | 52 | public void Microthread(IEnumerable thread) |
| 53 | { | 53 | { |
| 54 | 54 | ||
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | public void RunMicrothread() | 57 | public void RunMicrothread() |
| @@ -92,7 +92,7 @@ namespace OpenSim | |||
| 92 | 92 | ||
| 93 | public override void Stop() | 93 | public override void Stop() |
| 94 | { | 94 | { |
| 95 | 95 | ||
| 96 | } | 96 | } |
| 97 | } | 97 | } |
| 98 | } | 98 | } |