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
Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs
View File

@@ -18,10 +18,14 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
>>>>>>> 3616449 (preparando merge)
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")]
>>>>>>> 8ad9dc6 (faltan controladoras)
[assembly: System.Reflection.AssemblyProductAttribute("Controladora")]
[assembly: System.Reflection.AssemblyTitleAttribute("Controladora")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

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

@@ -1,5 +1,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
d7e6838ab345d847cad4078575babed33718cf28a47b8f27d6c4be1f7f7e97a7
=======
f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0
>>>>>>> 3616449 (preparando merge)
=======
bb93237b0189a4b8b1180fafac8534e65b007ad7d97889b9b241a52a4500d537
>>>>>>> 8ad9dc6 (faltan controladoras)

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

@@ -9,7 +9,11 @@ build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Controladora
<<<<<<< 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.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
=======

3
Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt
View File

@@ -13,3 +13,6 @@ C:\Users\Nacho\Desktop\verdadero\Controladora\obj\Debug\net6.0\ref\Controladora.
C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.dll
C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll
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