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/Data/DBGuids.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/Data/DBGuids.cs')
| -rw-r--r-- | OpenSim/Data/DBGuids.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/DBGuids.cs b/OpenSim/Data/DBGuids.cs index ad1c19c..1a2bf41 100644 --- a/OpenSim/Data/DBGuids.cs +++ b/OpenSim/Data/DBGuids.cs | |||
| @@ -38,7 +38,7 @@ namespace OpenSim.Data | |||
| 38 | /// <summary>This function converts a value returned from the database in one of the | 38 | /// <summary>This function converts a value returned from the database in one of the |
| 39 | /// supported formats into a UUID. This function is not actually DBMS-specific right | 39 | /// supported formats into a UUID. This function is not actually DBMS-specific right |
| 40 | /// now | 40 | /// now |
| 41 | /// | 41 | /// |
| 42 | /// </summary> | 42 | /// </summary> |
| 43 | /// <param name="id"></param> | 43 | /// <param name="id"></param> |
| 44 | /// <returns></returns> | 44 | /// <returns></returns> |