решение конфликтов

HoistingCrane/HoistingCrane/MapsCollection.cs

@@ -29,6 +29,9 @@ namespace HoistingCrane
         /// </summary>
         /// <param name="pictureWidth"></param>
         /// <param name="pictureHeight"></param>
+        ///   private readonly char separatorDict = '|';
+        private readonly char separatorData = ';';
+        private readonly char separatorDict = '|';
         public MapsCollection(int pictureWidth, int pictureHeight)
         {
             _mapStorages = new Dictionary<string, MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap>>();