From a11edceb00b5b86f825bd957bdac9edb91f893dd Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 2 Sep 2015 19:54:53 +0100
Subject: seems to compile ( tests comented out)

---
 OpenSim/Framework/VersionInfo.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'OpenSim/Framework/VersionInfo.cs')

diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs
index ea99444..f0ea96f 100644
--- a/OpenSim/Framework/VersionInfo.cs
+++ b/OpenSim/Framework/VersionInfo.cs
@@ -29,11 +29,7 @@ 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
+        public const string VersionNumber = "0.8.2.0CM";
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
 
         public enum Flavour
-- 
cgit v1.1