feat: Cambios Varios (mirar Desc)
- Añadidas referencias faltantes - Arreglado FormProveedores - Empiezo el codeo del Form Facturas
This commit is contained in:
@@ -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
|
||||
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
|
||||
//
|
||||
// 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")]
|
||||
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("Vista")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("Vista")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
5433dac5452fa5db31338aa45759172473b740a8027bf6a5b338d0bd8e08a305
|
||||
=======
|
||||
a90b7be7f25b3be585c8c3eda0cd50696de263dc
|
||||
@@ -11,3 +12,6 @@ a90b7be7f25b3be585c8c3eda0cd50696de263dc
|
||||
=======
|
||||
14dd92a1eca361463bdac6313faec43ff2400fcede9eb6798b98887050929b0b
|
||||
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|
||||
=======
|
||||
a90b7be7f25b3be585c8c3eda0cd50696de263dc
|
||||
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
|
||||
|
||||
@@ -11,6 +11,7 @@ build_property.RootNamespace = Vista
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Vista/
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Vista\
|
||||
@@ -23,3 +24,6 @@ build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Vista\
|
||||
>>>>>>> 3616449 (preparando merge)
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_OOP\Vista\
|
||||
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -13,7 +13,11 @@
|
||||
],
|
||||
"additionalProbingPaths": [
|
||||
"C:\\Users\\fedpo\\.dotnet\\store\\|arch|\\|tfm|",
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\Nacho\\.nuget\\packages"
|
||||
=======
|
||||
"C:\\Users\\fedpo\\.nuget\\packages"
|
||||
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
|
||||
],
|
||||
"configProperties": {
|
||||
"Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true
|
||||
|
||||
Reference in New Issue
Block a user