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/Framework/Lazy.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 'OpenSim/Framework/Lazy.cs')
| -rw-r--r-- | OpenSim/Framework/Lazy.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Lazy.cs b/OpenSim/Framework/Lazy.cs index 91de4bd..ea07d0e 100644 --- a/OpenSim/Framework/Lazy.cs +++ b/OpenSim/Framework/Lazy.cs | |||
| @@ -14,10 +14,10 @@ | |||
| 14 | // distribute, sublicense, and/or sell copies of the Software, and to | 14 | // distribute, sublicense, and/or sell copies of the Software, and to |
| 15 | // permit persons to whom the Software is furnished to do so, subject to | 15 | // permit persons to whom the Software is furnished to do so, subject to |
| 16 | // the following conditions: | 16 | // the following conditions: |
| 17 | // | 17 | // |
| 18 | // The above copyright notice and this permission notice shall be | 18 | // The above copyright notice and this permission notice shall be |
| 19 | // included in all copies or substantial portions of the Software. | 19 | // included in all copies or substantial portions of the Software. |
| 20 | // | 20 | // |
| 21 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | 21 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
| 22 | // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | 22 | // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
| 23 | // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | 23 | // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |