no pude usar controladoras, no carga los datos ,interface de cliente y provedor

Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs

@@ -19,6 +19,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
 =======
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
@@ -26,6 +27,9 @@ using System.Reflection;
 =======
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")]
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")]
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
 [assembly: System.Reflection.AssemblyProductAttribute("Controladora")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Controladora")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache

@@ -1,5 +1,6 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 d7e6838ab345d847cad4078575babed33718cf28a47b8f27d6c4be1f7f7e97a7
 =======
 f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0
@@ -7,3 +8,6 @@ f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0
 =======
 bb93237b0189a4b8b1180fafac8534e65b007ad7d97889b9b241a52a4500d537
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+41b9ae2cc417f11ef0d05afd64f424d30011ec3381b04e193604d3f4663cdb67
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)

Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig

@@ -10,10 +10,14 @@ build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Controladora
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Controladora/
 =======
 build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Controladora\
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
 =======

Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-a8e0260e0db6be55f0b0f28b550784baab05fd07
+19830861cd564e51db0c3967ce8e2d2c457eecffb478d0402938a76286038bed

Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt

@@ -16,3 +16,20 @@ C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.pdb
 C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\Controladora.dll
 C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll
 C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\Controladora.pdb
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.dll
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\refint\Controladora.dll
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.pdb
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.deps.json
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.dll
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.pdb
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Entidades.dll
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Modelo.dll
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Modelo.pdb
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Entidades.pdb
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controla.1EE7A4DA.Up2Date
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\ref\Controladora.dll