//------------------------------------------------------------------------------ // // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ using System; using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Modelo")] [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+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] >>>>>>> 8ad9dc6 (faltan controladoras) [assembly: System.Reflection.AssemblyProductAttribute("Modelo")] [assembly: System.Reflection.AssemblyTitleAttribute("Modelo")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] // Generado por la clase WriteCodeFragment de MSBuild.