102 lines
7.7 KiB
Plaintext
102 lines
7.7 KiB
Plaintext
<<<<<<< HEAD
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\SqlServerTypes\x86\SqlServerSpatial140.dll
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.exe.config
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.exe.manifest
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.application
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.exe
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\compabetov2.pdb
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\EntityFramework.dll
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\EntityFramework.SqlServer.dll
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\Microsoft.SqlServer.Types.dll
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\System.Data.SQLite.dll
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\System.Data.SQLite.EF6.dll
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\System.Data.SQLite.Linq.dll
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\EntityFramework.xml
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\EntityFramework.SqlServer.xml
|
|
C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\System.Data.SQLite.xml
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.AssemblyReference.cache
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarEmpleado1.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.AgregarLogin1.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Empleados.EditarEmpleado1.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Estadiscticas.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.cuentas.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.envios.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.inventario.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.login.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.MenuPrincipal.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.mermas.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.personal.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Properties.Resources.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.vender.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.verMerma.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.GenerateResource.cache
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.CoreCompileInputs.cache
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.exe.manifest
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.application
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.CopyComplete
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.exe
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.pdb
|
|
=======
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\SqlServerSpatial140.dll
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe.config
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe.manifest
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.application
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.pdb
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.dll
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.SqlServer.dll
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\Microsoft.SqlServer.Types.dll
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.dll
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.EF6.dll
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.Linq.dll
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.xml
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.SqlServer.xml
|
|
C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.xml
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.AssemblyReference.cache
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarEmpleado1.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin1.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.EditarEmpleado1.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Estadiscticas.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.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.agregarmermas.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.cuentas.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.envios.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.inventario.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.login.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.MenuPrincipal.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.mermas.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.personal.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Properties.Resources.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.vender.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.verMerma.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.GenerateResource.cache
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.CoreCompileInputs.cache
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.exe.manifest
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.application
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.CopyComplete
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.exe
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.pdb
|
|
>>>>>>> c401f0a5d425880eadaf1bd65205d8559b5d39bc
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Ventas.datosEnvio.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Ventas.datosEnvio.resources
|
|
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Ventas.datosCuenta.resources
|
|
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Ventas.datosCuenta.resources
|