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

merge gigante

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:19:38 -03:00
parent 6498597664
commit 1aded875ab
84 changed files with 3063 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs
View File

@@ -13,7 +13,11 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Modelo")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")]
>>>>>>> 8ad9dc6 (faltan controladoras)
[assembly: System.Reflection.AssemblyProductAttribute("Modelo")]
[assembly: System.Reflection.AssemblyTitleAttribute("Modelo")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

4
Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache
View File

@@ -1 +1,5 @@
<<<<<<< HEAD
19528923356c4738a962f057922a97a48b791eef234ebbc88765733e95d58587
=======
6c9da482cd44cc74518e5bd440e7d4a72fa32487ea46c6d9bb7a9bacf4043c2b
>>>>>>> 8ad9dc6 (faltan controladoras)

4
Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig
View File

@@ -8,6 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Modelo
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Modelo/
=======
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Modelo\
>>>>>>> 8ad9dc6 (faltan controladoras)
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =