1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs
index d2979a7..ea99444 100644
--- a/OpenSim/Framework/VersionInfo.cs
+++ b/OpenSim/Framework/VersionInfo.cs
@@ -29,11 +29,15 @@ namespace OpenSim
 {
     public class VersionInfo
     {
+<<<<<<< HEAD:OpenSim/Framework/VersionInfo.cs
         public const string VersionNumber = "0.8.2.0";
+=======
+        private const string VERSION_NUMBER = "0.8.0CM";
+>>>>>>> avn/ubitvar:OpenSim/Framework/Servers/VersionInfo.cs
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
 
         public enum Flavour
-        {
+        { 
             Unknown,
             Dev,
             RC1,
@@ -51,7 +55,7 @@ namespace OpenSim
 
         public static string GetVersionString(string versionNumber, Flavour flavour)
         {
-            string versionString = "OpenSim " + versionNumber + " " + flavour;
+            string versionString = "Careminster " + versionNumber + " " + flavour;
             return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
         }