From 64985976641cd196785925155b416c6e83c6cb24 Mon Sep 17 00:00:00 2001
From: fede <federico.nicolas.polidoro@gmail.com>
Date: Sun, 11 Aug 2024 18:18:29 -0300
Subject: [PATCH] preparando merge

---
 .vs/Final_OOP/v17/.suo                        | Bin 105984 -> 105472 bytes
 .../Debug/net6.0/Controladora.AssemblyInfo.cs |  10 +++++++++-
 .../Controladora.AssemblyInfoInputs.cache     |   4 ++++
 ....GeneratedMSBuildEditorConfig.editorconfig |   4 ++++
 .../net6.0-windows/Vista.AssemblyInfo.cs      |  10 +++++++++-
 .../Vista.AssemblyInfoInputs.cache            |   4 ++++
 ....GeneratedMSBuildEditorConfig.editorconfig |   4 ++++
 .../Vista.designer.runtimeconfig.json         |   2 +-
 8 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/.vs/Final_OOP/v17/.suo b/.vs/Final_OOP/v17/.suo
index f55695161c0c62f5e514ebc00bfc542c2fda627d..1c9f0bb89148cc7d04691e140e85697ab1f48862 100644
GIT binary patch
delta 495
zcmZqJ!`85aZGr(K(?mmQR%QkU2Jwx7zgZ{yFe!4pRpxy3^cG|I<WjctlU<niOyb~R
z<etpQA?@)W2+V+LjewXHh^>IwABaKXwouv>NDBe68xTtXu{;p}1<LCIX=fk?shym|
zqQEFHxtGOU6vUN;3WM0@KsN8>n=HzLd_a~v5L-ZHxhC_nexAg`vYCbJ5BH>$Bb$%7
zMKDg5QCKngh|K@VhZSuXNib~^I>9*kgnY<k8M8Gken5?r6IaSlHelkM{Kd?F@?mB}
z)(JqtwUd8}=uTc{F2~^w<XIyrV@(2bwr&0?&(1VS#DxRoH+v-M%_Sl|jEhv57%QeL
zgfYt5x-jH3lr!Wp<N)bJh7^Wkh8Uo~Gl3$BKrvKy7*M>Jp#&%c5-(!NoxZVxQC6WT
zY~#kfX%~OgFNpo;9VX}+a!vc7@T!mPTV$@kSZlz&XR@HC=;n1<L5$Nc&SJFOY^iaa
zd9tIi{ABrrL;<NOlltSL+Pi;gh%dX4QI@}XLP7!KB0Z)_DjkfXlRH&bPfR(}WVFnP
GF$(~(jH2@Z

delta 825
zcmY+?%TE(Q9Ki9NvfFmCD5X9cT5XZ4_(DVt=|L@m4?w{xdN3X|F_37C6<dS&Xyd_?
z2is{R@nD(;HN=yw2M-=hFp-;j^+w{K;6Xxse1FMe)=5A8&2Q#6GuhoKz4Mpe`=4~_
zT-7e8BbG7@Bm5@2Y^juP^Cj%e+uFtDN8i*5UGRT4!_4Z%-iXf4HtQ~*t@DAZYSMNv
zRy@emT3Gl)+dxdZ{UdH%N8FE1=tlx==!C3kB%Vb8yAj6@G-C@oVB<M9BZ6I6Z5T!4
zFr7olAcZ}MA&RY#1El@J0rDPqEbYeio*Jp!PQDYZIPT81xUt=hQn!)*fb2F%X9y>8
z3d1-JDLUiEQQ~j%YsB-oQqK0M8|7?lbemft)zWh0H!*=*C_u(<6DQsN9pV)3;vVkf
z0g5Q0-WaOX`t*FmUMF9Btm>^kewAo{P&V>YpfArR<U6WYP9Zw1Y<ZJLlV`%ZPGah%
z@Sv?^kvz}JBAss;k-c@MYC1pTDdohI-&JL%&r<Tf|Gy_QUxM<4$Gqz^)25z$F=VSG
zqes0nAD)^j<SexZd~*{E%9L-ua%yOt<Ta#Ce|@IXPP*e$!`#$IWv*e!du(VG10}iA
zw0ftnGB$51xj5b;{bQ`8&gsJVNbmwva@YQyC6})r;E(pO`(?Mfs(be(oW!L?^%qDK
B>}dc1

diff --git a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs
index 3b30a82..d1a4d5e 100644
--- a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs
+++ b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs
@@ -1,6 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+<<<<<<< HEAD
+=======
+//     Runtime Version:4.0.30319.42000
+>>>>>>> 3616449 (preparando merge)
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -13,10 +17,14 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Controladora")]
 [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")]
+>>>>>>> 3616449 (preparando merge)
 [assembly: System.Reflection.AssemblyProductAttribute("Controladora")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Controladora")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
 
-// Generado por la clase WriteCodeFragment de MSBuild.
+// Generated by the MSBuild WriteCodeFragment class.
 
diff --git a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache
index ff2fb21..aaacfbb 100644
--- a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache
+++ b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
 d7e6838ab345d847cad4078575babed33718cf28a47b8f27d6c4be1f7f7e97a7
+=======
+f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0
+>>>>>>> 3616449 (preparando merge)
diff --git a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig b/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig
index 5b69504..b526605 100644
--- a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,10 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Controladora
+<<<<<<< HEAD
 build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Controladora/
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
+=======
+build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Controladora\
+>>>>>>> 3616449 (preparando merge)
diff --git a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs
index 33381e4..c4602ec 100644
--- a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs
+++ b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs
@@ -1,6 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+<<<<<<< HEAD
+=======
+//     Runtime Version:4.0.30319.42000
+>>>>>>> 3616449 (preparando merge)
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -13,12 +17,16 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Vista")]
 [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")]
+>>>>>>> 3616449 (preparando merge)
 [assembly: System.Reflection.AssemblyProductAttribute("Vista")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Vista")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
 [assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
 [assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
 
-// Generado por la clase WriteCodeFragment de MSBuild.
+// Generated by the MSBuild WriteCodeFragment class.
 
diff --git a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache
index 42011c0..8329291 100644
--- a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache
+++ b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
 5433dac5452fa5db31338aa45759172473b740a8027bf6a5b338d0bd8e08a305
+=======
+a90b7be7f25b3be585c8c3eda0cd50696de263dc
+>>>>>>> 3616449 (preparando merge)
diff --git a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig b/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig
index 7013c40..38c7c8c 100644
--- a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,10 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Vista
+<<<<<<< HEAD
 build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Vista/
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
+=======
+build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Vista\
+>>>>>>> 3616449 (preparando merge)
diff --git a/Vista/obj/Debug/net6.0-windows/Vista.designer.runtimeconfig.json b/Vista/obj/Debug/net6.0-windows/Vista.designer.runtimeconfig.json
index d224722..a122db1 100644
--- a/Vista/obj/Debug/net6.0-windows/Vista.designer.runtimeconfig.json
+++ b/Vista/obj/Debug/net6.0-windows/Vista.designer.runtimeconfig.json
@@ -12,7 +12,7 @@
       }
     ],
     "additionalProbingPaths": [
-      "C:\\Users\\Nacho\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\fedpo\\.dotnet\\store\\|arch|\\|tfm|",
       "C:\\Users\\Nacho\\.nuget\\packages"
     ],
     "configProperties": {