feat: terminados 4 de 7 forms
This commit is contained in:
@@ -15,6 +15,7 @@ build_property.RootNamespace = Controladora
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Controladora/
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Controladora\
|
||||
@@ -39,3 +40,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\C
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Controladora\
|
||||
>>>>>>> 3925b59 (cambios nacho)
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\Controladora\
|
||||
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
07cbdde4e47ec2d3a6db548797ff84a15aa08946633217fe5ed64773b3cc8491
|
||||
=======
|
||||
39c8634b9e930bb7c3ea67187f4543b71aaf8be2
|
||||
>>>>>>> 82ef086 (a)
|
||||
=======
|
||||
dba3ec7c7a0b4bd2c09ad0be4ae57d8a36772676
|
||||
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
|
||||
|
||||
@@ -32,3 +32,20 @@ C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.d
|
||||
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll
|
||||
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.pdb
|
||||
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Controladora.deps.json
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Controladora.dll
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Controladora.pdb
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Entidades.dll
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Modelo.dll
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Modelo.pdb
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Entidades.pdb
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CopyComplete
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.dll
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb
|
||||
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user