39 lines
1.6 KiB
C#
39 lines
1.6 KiB
C#
//------------------------------------------------------------------------------
|
|
// <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.
|
|
// </auto-generated>
|
|
//------------------------------------------------------------------------------
|
|
|
|
using System;
|
|
using System.Reflection;
|
|
|
|
[assembly: System.Reflection.AssemblyCompanyAttribute("Controladora")]
|
|
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
|
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
|
<<<<<<< HEAD
|
|
<<<<<<< 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.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")]
|
|
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|
|
[assembly: System.Reflection.AssemblyProductAttribute("Controladora")]
|
|
[assembly: System.Reflection.AssemblyTitleAttribute("Controladora")]
|
|
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
|
|
|
// Generated by the MSBuild WriteCodeFragment class.
|
|
|