conflict fix 1

SoftwareInstallation/AbstractSoftwareInstallationBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -65,7 +65,7 @@ namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
             }
             model.Status = OrderStatus.Принят;
             model.DateCreate = DateTime.Now;
-            if (_orderStorage.Insert(model) == null) 
+            if (_orderStorage.Insert(model) == null)
             {
                 model.Status = OrderStatus.Неизвестен;
                 _logger.LogWarning("Failed to insert order into a storage");
@@ -115,4 +115,4 @@ namespace AbstractSoftwareInstallationBusinessLogic.BusinessLogic
             return StatusUpdate(model, OrderStatus.Готов);
         }
     }
-}
+}

SoftwareInstallation/AbstractSoftwareInstallationContracts/ViewModels/PackageViewModel.cs

@@ -22,4 +22,4 @@ namespace AbstractSoftwareInstallationContracts.ViewModels
         } = new();
 
     }
-}
+}

SoftwareInstallation/AbstractSoftwareInstallationListImplement/Implements/SoftwareStorage.cs

@@ -45,7 +45,7 @@ namespace AbstractSoftwareInstallationListImplement.Implements
             {
                 return null;
             }
-        foreach (var software in _source.Softwares)
+            foreach (var software in _source.Softwares)
             {
                 if ((!string.IsNullOrEmpty(model.SoftwareName) &&
                software.SoftwareName == model.SoftwareName) ||
@@ -102,4 +102,4 @@ namespace AbstractSoftwareInstallationListImplement.Implements
         }
 
     }
-}
+}