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

fix: arreglado nivel de acceso para las controladoras

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:20:40 -03:00
parent e82c5a70b8
commit de217e2d8a
26 changed files with 469 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,9 +2,13 @@
// <auto-generated>
// This code was generated by a tool.
<<<<<<< HEAD
<<<<<<< HEAD
=======
// Runtime Version:4.0.30319.42000
>>>>>>> 3616449 (preparando merge)
=======
// Runtime Version:4.0.30319.42000
>>>>>>> 9b0bde2 (fix: arreglado nivel de acceso para las controladoras)
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -20,6 +24,7 @@ using System.Reflection;
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
@@ -30,6 +35,9 @@ using System.Reflection;
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")]
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
>>>>>>> 9b0bde2 (fix: arreglado nivel de acceso para las controladoras)
[assembly: System.Reflection.AssemblyProductAttribute("Controladora")]
[assembly: System.Reflection.AssemblyTitleAttribute("Controladora")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]