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

preparando merge

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:18:29 -03:00
parent faa80790ee
commit 6498597664
8 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Final_OOP/v17/.suo
View File

Binary file not shown.

10
Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs
View File

@@ -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.

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

@@ -1 +1,5 @@
<<<<<<< HEAD
d7e6838ab345d847cad4078575babed33718cf28a47b8f27d6c4be1f7f7e97a7
=======
f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0
>>>>>>> 3616449 (preparando merge)

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

@@ -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)

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

@@ -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.

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

@@ -1 +1,5 @@
<<<<<<< HEAD
5433dac5452fa5db31338aa45759172473b740a8027bf6a5b338d0bd8e08a305
=======
a90b7be7f25b3be585c8c3eda0cd50696de263dc
>>>>>>> 3616449 (preparando merge)

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

@@ -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)

2
Vista/obj/Debug/net6.0-windows/Vista.designer.runtimeconfig.json
View File

@@ -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": {