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/Tests/Common/LongRunningAttribute.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/Tests/Common/LongRunningAttribute.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/LongRunningAttribute.cs b/OpenSim/Tests/Common/LongRunningAttribute.cs index 9831ea8..6013fcb 100644 --- a/OpenSim/Tests/Common/LongRunningAttribute.cs +++ b/OpenSim/Tests/Common/LongRunningAttribute.cs | |||
| @@ -35,11 +35,11 @@ namespace OpenSim.Tests.Common | |||
| 35 | [AttributeUsage(AttributeTargets.All, | 35 | [AttributeUsage(AttributeTargets.All, |
| 36 | AllowMultiple = false, | 36 | AllowMultiple = false, |
| 37 | Inherited = true)] | 37 | Inherited = true)] |
| 38 | public class LongRunningAttribute : CategoryAttribute | 38 | public class LongRunningAttribute : CategoryAttribute |
| 39 | { | 39 | { |
| 40 | public LongRunningAttribute() : this("Long Running Test") | 40 | public LongRunningAttribute() : this("Long Running Test") |
| 41 | { | 41 | { |
| 42 | 42 | ||
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | protected LongRunningAttribute(string category) : base(category) | 45 | protected LongRunningAttribute(string category) : base(category) |