w

Configuration/GlobalAssemblyInfo.cs

@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "0";
 	public const string Build = "0";
-	public const string Revision = "1036";
+	public const string Revision = "1038";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

Configuration/Version.defs

@@ -1,4 +1,4 @@
 %MINOR%=0
-%REVISION%=1036
+%REVISION%=1038
 %MAJOR%=3
 %COREVERSION%=0

ReleaseGenerators/PascalABCNET_version.nsh

@@ -1 +1 @@
-!define VERSION '3.0.0.1036'
+!define VERSION '3.0.0.1038'

TestSuite/CompilationSamples/PABCSystem.pas

@@ -2768,7 +2768,7 @@ begin
     var sb := new StringBuilder();
     var g := (o as System.Collections.IEnumerable).GetEnumerator();
     
-    var isdictorset := o.GetType.Name.Equals('Dictionary`2') or (o.GetType=typeof(TypedSet));
+    var isdictorset := o.GetType.Name.Equals('Dictionary`2') or o.GetType.Name.Equals('SortedDictionary`2') or (o.GetType=typeof(TypedSet)) or o.GetType.Name.Equals('HashSet`1') or o.GetType.Name.Equals('SortedSet`1');
     if isdictorset then
       sb.Append('{')
     else sb.Append('[');

TreeConverter/TreeConversion/CompilationErrors.cs

@@ -144,12 +144,8 @@ namespace PascalABCCompiler.TreeConverter
         {
             if (values != null)
                 return string.Format(StringResources.Get(ErrResourceString), values);
-<<<<<<< HEAD
-            else return string.Format(StringResources.Get(ErrResourceString),"");
-=======
             else
                 return string.Format(StringResources.Get(ErrResourceString), "");
->>>>>>> 723c42a9a7eb640d4070e6baabe6e553909acbd4
         }
     }