preparando para el merge

2024-08-03 21:16:21 +01:00
parent c493033009
commit 57b84cdf9a
10 changed files with 18 additions and 1 deletions
--- a/.vs/Final_OOP/v17/.suo
+++ b/.vs/Final_OOP/v17/.suo
--- a/Controladora/bin/Debug/net6.0/Controladora.dll
+++ b/Controladora/bin/Debug/net6.0/Controladora.dll
--- a/Controladora/bin/Debug/net6.0/Controladora.pdb
+++ b/Controladora/bin/Debug/net6.0/Controladora.pdb
--- a/Controladora/obj/Debug/net6.0/Controladora.csproj.AssemblyReference.cache
+++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.AssemblyReference.cache
--- a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache
+++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-f2a6af9cbfa305ccb49144b674ae7e4ce398d6da648f0a2ed5600aa09ceb1f7c
+57f080c451434127a4f00cc492b37e2bfd251cea
--- a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt
+++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt
@@ -81,3 +81,20 @@ C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\Controladora.dl
 C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll
 C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\Controladora.pdb
 C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\ref\Controladora.dll
 C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Controladora.deps.json
 C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Controladora.dll
 C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Controladora.pdb
 C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Entidades.dll
 C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Modelo.dll
 C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Modelo.pdb
 C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Entidades.pdb
 C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache
 C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig
 C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache
 C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs
 C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache
 C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.csproj.CopyComplete
 C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.dll
 C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll
 C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.pdb
 C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\ref\Controladora.dll
--- a/Controladora/obj/Debug/net6.0/Controladora.dll
+++ b/Controladora/obj/Debug/net6.0/Controladora.dll
--- a/Controladora/obj/Debug/net6.0/Controladora.pdb
+++ b/Controladora/obj/Debug/net6.0/Controladora.pdb
--- a/Controladora/obj/Debug/net6.0/ref/Controladora.dll
+++ b/Controladora/obj/Debug/net6.0/ref/Controladora.dll
--- a/Controladora/obj/Debug/net6.0/refint/Controladora.dll
+++ b/Controladora/obj/Debug/net6.0/refint/Controladora.dll
`@@ -1 +1 @@`
	`f2a6af9cbfa305ccb49144b674ae7e4ce398d6da648f0a2ed5600aa09ceb1f7c`	`57f080c451434127a4f00cc492b37e2bfd251cea`