From 87d0990c81f6c225e5d246cc5ce18a8410c3bbbc Mon Sep 17 00:00:00 2001 From: devil_1nc Date: Mon, 22 May 2023 19:38:55 +0400 Subject: [PATCH] conflict fix 2 --- .../BindingModels/PackageBindingModel.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/PackageBindingModel.cs b/SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/PackageBindingModel.cs index 3b2f746..a37e76f 100644 --- a/SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/PackageBindingModel.cs +++ b/SoftwareInstallation/AbstractSoftwareInstallationContracts/BindingModels/PackageBindingModel.cs @@ -12,7 +12,7 @@ namespace AbstractSoftwareInstallationContracts.BindingModels public int Id { get; set; } public string PackageName { get; set; } = string.Empty; public double Price { get; set; } - public Dictionary PackageSoftware{get;set;} = new(); - public object PackageSoftwares { get; set; } + public Dictionary PackageSoftware { get; set; } = new(); + } -} +} \ No newline at end of file