fede/Final_Das
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

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

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:20:24 -03:00
parent 1aded875ab
commit e82c5a70b8
46 changed files with 6435 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs
View File

@@ -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("Vista")]
[assembly: System.Reflection.AssemblyTitleAttribute("Vista")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

4
Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache
View File

@@ -1,5 +1,6 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
5433dac5452fa5db31338aa45759172473b740a8027bf6a5b338d0bd8e08a305
=======
a90b7be7f25b3be585c8c3eda0cd50696de263dc
@@ -7,3 +8,6 @@ a90b7be7f25b3be585c8c3eda0cd50696de263dc
=======
244ec86832aa35c5b9c5e6ebfc71403d927ad498ea5d0b2c0c49514ce34338d6
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
14dd92a1eca361463bdac6313faec43ff2400fcede9eb6798b98887050929b0b
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)

4
Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig
View File

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