Merge branch 'master' into vehicles

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
index eb77e65..fb269b7 100644
--- a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Framework.Serialization.External
     /// Serialize and deserialize region settings as an external format.
     /// </summary>
     public class UserProfileSerializer
-    {    
+    {
         public const int MAJOR_VERSION = 0;
         public const int MINOR_VERSION = 1;
         
@@ -65,6 +65,6 @@ namespace OpenSim.Framework.Serialization.External
             sw.Close();
             
             return sw.ToString();
-        }        
+        }
     }
 }
\ No newline at end of file