diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Framework/VersionInfo.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Framework/VersionInfo.cs')
-rw-r--r-- | OpenSim/Framework/VersionInfo.cs | 6 |
1 files changed, 1 insertions, 5 deletions
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 | |||
29 | { | 29 | { |
30 | public class VersionInfo | 30 | public class VersionInfo |
31 | { | 31 | { |
32 | <<<<<<< HEAD:OpenSim/Framework/VersionInfo.cs | 32 | public const string VersionNumber = "0.8.2.0CM"; |
33 | public const string VersionNumber = "0.8.2.0"; | ||
34 | ======= | ||
35 | private const string VERSION_NUMBER = "0.8.0CM"; | ||
36 | >>>>>>> avn/ubitvar:OpenSim/Framework/Servers/VersionInfo.cs | ||
37 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; | 33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; |
38 | 34 | ||
39 | public enum Flavour | 35 | public enum Flavour |