diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index 8d2232c..302f646 100644 Binary files a/bin/Debug/compabetov2.exe and b/bin/Debug/compabetov2.exe differ diff --git a/bin/Debug/compabetov2.pdb b/bin/Debug/compabetov2.pdb index 1fa2044..52432ef 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/obj/Debug/compabetov2.csproj.AssemblyReference.cache b/obj/Debug/compabetov2.csproj.AssemblyReference.cache index 668157a..ed74861 100644 Binary files a/obj/Debug/compabetov2.csproj.AssemblyReference.cache and b/obj/Debug/compabetov2.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache index 7b50727..a709343 100644 --- a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache +++ b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -c1cf5d87017027705d6c2ec0d3ad2a8c7ff08f19 -======= -5d59b1013627d47320299052a443bf2f5f938b5e44e9ca7b957196b5427dd7b6 ->>>>>>> 58838e4ed1242ca0331f346a14f3dfa8c9379ee8 +afcee79e89ecbbd9a66338909aef75a56f5f932f diff --git a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt index cee5f43..2cce3ba 100644 --- a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt +++ b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt @@ -91,3 +91,6 @@ C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.pdb C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources diff --git a/obj/Debug/compabetov2.csproj.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache index f0b8736..0b67fb0 100644 Binary files a/obj/Debug/compabetov2.csproj.GenerateResource.cache and b/obj/Debug/compabetov2.csproj.GenerateResource.cache differ diff --git a/obj/Debug/compabetov2.exe b/obj/Debug/compabetov2.exe index 8d2232c..302f646 100644 Binary files a/obj/Debug/compabetov2.exe and b/obj/Debug/compabetov2.exe differ diff --git a/obj/Debug/compabetov2.pdb b/obj/Debug/compabetov2.pdb index 1fa2044..52432ef 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ