фикс слияния

ProjectPolyclinic/ProjectPolyclinic/Forms/DrugsCountReport.resx

@@ -59,7 +59,9 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http:
+			  
+www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>

ProjectPolyclinic/ProjectPolyclinic/Forms/FormDirectoryReport.Designer.cs

@@ -2,7 +2,12 @@
 {
     partial class FormDirectoryReport
     {
-        /// <summary>
+        
+        
+        
+        
+        
+        / <summary>
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.IContainer components = null;

ProjectPolyclinic/ProjectPolyclinic/Forms/FormDirectoryReport.resx

@@ -59,7 +59,11 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http:
+			  
+
+
+www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>

ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctor.Designer.cs

@@ -2,7 +2,8 @@
 {
     partial class FormDoctor
     {
-        /// <summary>
+        
+        / <summary>
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.IContainer components = null;

ProjectPolyclinic/ProjectPolyclinic/Repositories/Implementations/DoctorRepository.cs

@@ -54,7 +54,6 @@ public class DoctorRepository : IDoctorRepository
         {
             using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
 
-            // Проверяем, существует ли запись
             var existingDoctor = connection.QueryFirstOrDefault<Doctor>("SELECT * FROM Doctors WHERE id = @Id", new { doctor.Id });
             if (existingDoctor == null)
             {

ProjectPolyclinic/ProjectPolyclinic/Repositories/Implementations/MedicalHistoryRepository.cs

@@ -169,11 +169,4 @@ public class MedicalHistoryRepository : IMedicalHistoryRepository
             throw;
         }
     }
-
-
-
-
-
-
-
 }