no pude usar controladoras, no carga los datos ,interface de cliente y provedor
This commit is contained in:
@@ -14,10 +14,14 @@ using System.Reflection;
|
||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
|
||||
=======
|
||||
[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("Entidades")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("Entidades")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
c9fd7d1da15719a344d19280a9e21a8dc924eb19882884c600d67b0cd9fae973
|
||||
=======
|
||||
390fb09e0b78446d2aeb62456ecd394479e4203d8ba487fbe31e39283ec058af
|
||||
>>>>>>> 8ad9dc6 (faltan controladoras)
|
||||
=======
|
||||
a687cba9ed7450e5c700a51cb95b1f9a0a0edc042a19f86ad94db189023a05ac
|
||||
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|
||||
|
||||
@@ -9,9 +9,13 @@ build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = Entidades
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Entidades/
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Entidades\
|
||||
>>>>>>> 8ad9dc6 (faltan controladoras)
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Entidades\
|
||||
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
|
||||
Reference in New Issue
Block a user