From 6c25c1a3a9bd1a25ddab03709a89f41e705473c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?10=D0=93=20=D0=95=D0=B3=D0=BE=D1=80=20=D0=A0=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <romanov17903@yandex.ru>
Date: Tue, 7 Mar 2023 14:04:23 +0400
Subject: [PATCH] fix

---
 SecuritySystemContracts/SearchModels/SecureSearchModel.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/SecuritySystemContracts/SearchModels/SecureSearchModel.cs b/SecuritySystemContracts/SearchModels/SecureSearchModel.cs
index 1778cfb..8547e9f 100644
--- a/SecuritySystemContracts/SearchModels/SecureSearchModel.cs
+++ b/SecuritySystemContracts/SearchModels/SecureSearchModel.cs
@@ -6,16 +6,10 @@ using System.Threading.Tasks;
 
 namespace SecuritySystemContracts.SearchModels
 {
-<<<<<<< HEAD:SecuritySystemContracts/SearchModels/ComponentSearchModel.cs
-    public class ComponentSearchModel
-    {
-        public int? Id { get; set; }
-        public string? ComponentName { get; set; }
-=======
     public class SecureSearchModel
     {
         public int? Id { get; set; }
         public string? SecureName { get; set; }
->>>>>>> Rename:SecuritySystemContracts/SearchModels/SecureSearchModel.cs
+
     }
 }