laksdda
Merge
Conflicts:
	BECA2/DAL/Repositories/UsuarioRepository.cs
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/UI.vbproj
Arreglando
Arreglando
Arreglando
Merge branch 'master' of https://github.com/KOIP2/AplicacionBeca2-KOI
Arreglando

Arreglando

Arreglando

Merge
Conflicts:
	BECA2/DAL/Repositories/UsuarioRepository.cs
	BECA2/UI/My
Project/Application.Designer.vb
	BECA2/UI/My
Project/Application.myapp
	BECA2/UI/UI.vbproj

laksdda

merge

Merge

wen

jorge

marco

beca, perfil, contraseña

gitignore
Merge remote-tracking branch 'origin/master' into Wen

Conflicts:
	BECA2/BLL/BLL.csproj
	BECA2/BLL/GestorBeca.cs
	BECA2/BLL/GestorCarrera.cs
	BECA2/BLL/GestorCurso.cs
	BECA2/BLL/GestorInicioSesion.cs
	BECA2/BLL/GestorUsuario.cs
	BECA2/DAL/DAL.csproj
	BECA2/DAL/DBAcces.cs
	BECA2/DAL/IniciarSesion.cs
	BECA2/DAL/Repositories/BecaRepository.cs
	BECA2/DAL/Repositories/CarreraRepository.cs
	BECA2/DAL/Repositories/CursoRepository.cs
	BECA2/DAL/Repositories/UsuarioRepository.cs
	BECA2/DAL/UnitOfWork.cs
	BECA2/EntitiesLayer/Beca.cs
	BECA2/EntitiesLayer/Carrera.cs
	BECA2/EntitiesLayer/Curso.cs
	BECA2/EntitiesLayer/EntitiesLayer.csproj
	BECA2/EntitiesLayer/Notificacion.cs
	BECA2/EntitiesLayer/Sesion.cs
	BECA2/EntitiesLayer/Usuario.cs
	BECA2/TIL/CustomExceptions.cs
	BECA2/UI/App.config
	BECA2/UI/Frm_AsociarCarreras.resx
	BECA2/UI/Frm_Beca.resx
	BECA2/UI/Frm_BitacoraAcciones.resx
	BECA2/UI/Frm_CambiarContrasenia.resx
	BECA2/UI/Frm_Carreras.vb
	BECA2/UI/Frm_CrearBeneficio.Designer.vb
	BECA2/UI/Frm_CrearBeneficio.vb
	BECA2/UI/Frm_CrearCarrera.designer.vb
	BECA2/UI/Frm_CrearCarrera.vb
	BECA2/UI/Frm_CrearCurso.Designer.vb
	BECA2/UI/Frm_CrearCurso.vb
	BECA2/UI/Frm_CrearDetalleHistorial.resx
	BECA2/UI/Frm_CrearHistorial.resx
	BECA2/UI/Frm_CrearRequisito.resx
	BECA2/UI/Frm_CrearUsuario.Designer.vb
	BECA2/UI/Frm_CrearUsuario.resx
	BECA2/UI/Frm_CrearUsuario.vb
	BECA2/UI/Frm_InicioDeSesion.Designer.vb
	BECA2/UI/Frm_InicioDeSesion.resx
	BECA2/UI/Frm_InicioDeSesion.vb
	BECA2/UI/Frm_ModificarCarrera.Designer.vb
	BECA2/UI/Frm_ModificarCarrera.vb
	BECA2/UI/Frm_ModificarCurso.Designer.vb
	BECA2/UI/Frm_ModificarCurso.vb
	BECA2/UI/Frm_Princiapal.vb
	BECA2/UI/Frm_SeleccionarCarreras.Designer.vb
	BECA2/UI/Frm_SeleccionarCarreras.vb
	BECA2/UI/ModuloGlobal.vb
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/My Project/AssemblyInfo.vb
	BECA2/UI/My Project/Resources.Designer.vb
	BECA2/UI/My Project/Resources.resx
	BECA2/UI/My Project/Settings.Designer.vb
	BECA2/UI/My Project/Settings.settings
	BECA2/UI/Pop up/pop_up_inicioSesion.Designer.vb
	BECA2/UI/Pop up/pop_up_mensaje.Designer.vb
	BECA2/UI/Pop up/pop_up_mensaje.yo-NG.resx
	BECA2/UI/UI.vbproj
	BECA2/UI/Uc_Becas.Designer.vb
	BECA2/UI/Uc_Carreras.Designer.vb
	BECA2/UI/Uc_Carreras.vb
	BECA2/UI/Uc_Principal.Designer.vb
	BECA2/UI/Uc_SeleccionarCarreras.Designer.vb
	BECA2/UI/Uc_SeleccionarCarreras.resx
	BECA2/UI/Uc_SeleccionarCarreras.vb
	BECA2/UI/uCMenu.Designer.vb
	BECA2/UI/uCMenu.vb
solucion
TIL
listo
listo
Merge branch 'Wen' of https://github.com/KOIP2/AplicacionBeca2-KOI into Wen

Conflicts:
	BECA2.rar
	BECA2/BLL/GestorBeca.cs
	BECA2/BLL/GestorCarrera.cs
	BECA2/BLL/GestorGeneral.cs
	BECA2/BLL/GestorUsuario.cs
	BECA2/DAL/IniciarSesion.cs
	BECA2/DAL/Repositories/BecaRepository.cs
	BECA2/DAL/Repositories/TipoBecaRepository.cs
	BECA2/DAL/Repositories/UsuarioRepository.cs
	BECA2/DAL/UnitOfWork.cs
	BECA2/DAL/Utility/IUtility.cs
	BECA2/DAL/Utility/UtilidadesRol.cs
	BECA2/DAL/Utility/UtilidadesTipoBeca.cs
	BECA2/DAL/Utility/UtilidadesUsuario.cs
	BECA2/EntitiesLayer/Beca.cs
	BECA2/EntitiesLayer/Usuario.cs
	BECA2/UI/App.config
	BECA2/UI/Frm_CambiarContrasenia.resx
	BECA2/UI/Frm_CrearBeneficio.vb
	BECA2/UI/Frm_CrearCarrera.vb
	BECA2/UI/Frm_CrearUsuario.Designer.vb
	BECA2/UI/Frm_CrearUsuario.vb
	BECA2/UI/Frm_InicioDeSesion.resx
	BECA2/UI/Frm_ModificarBeneficio.vb
	BECA2/UI/Frm_MostrarCurso.Designer.vb
	BECA2/UI/Frm_Principal.Designer.vb
	BECA2/UI/Frm_Principal.resx
	BECA2/UI/Frm_Principal.vb
	BECA2/UI/Frm_SeleccionarCarreras.vb
	BECA2/UI/My Project/Resources.resx
	BECA2/UI/UC_ConsultarBecas.Designer.vb
	BECA2/UI/UC_ConsultarBecas.vb
	BECA2/UI/UC_SeleccionarBeneficios.vb
	BECA2/UI/UC_SeleccionarRequisitos.vb
	BECA2/UI/UI.vbproj
	BECA2/UI/Uc_Becas.vb
	BECA2/UI/Uc_CambiarContrasenna.vb
	BECA2/UI/Uc_Perfil.Designer.vb
	BECA2/UI/Uc_Principal.Designer.vb
	BECA2/UI/Uc_SeleccionarCarreras.vb
Merge branch 'Wen' of https://github.com/KOIP2/AplicacionBeca2-KOI into Wen

Conflicts:
	BECA2.rar
	BECA2/BLL/GestorBeca.cs
	BECA2/BLL/GestorCarrera.cs
	BECA2/BLL/GestorGeneral.cs
	BECA2/BLL/GestorUsuario.cs
	BECA2/DAL/IniciarSesion.cs
	BECA2/DAL/Repositories/BecaRepository.cs
	BECA2/DAL/Repositories/TipoBecaRepository.cs
	BECA2/DAL/Repositories/UsuarioRepository.cs
	BECA2/DAL/UnitOfWork.cs
	BECA2/DAL/Utility/IUtility.cs
	BECA2/DAL/Utility/UtilidadesRol.cs
	BECA2/DAL/Utility/UtilidadesTipoBeca.cs
	BECA2/DAL/Utility/UtilidadesUsuario.cs
	BECA2/EntitiesLayer/Beca.cs
	BECA2/EntitiesLayer/Usuario.cs
	BECA2/UI/App.config
	BECA2/UI/Frm_CambiarContrasenia.resx
	BECA2/UI/Frm_CrearBeneficio.vb
	BECA2/UI/Frm_CrearCarrera.vb
	BECA2/UI/Frm_CrearUsuario.Designer.vb
	BECA2/UI/Frm_CrearUsuario.vb
	BECA2/UI/Frm_InicioDeSesion.resx
	BECA2/UI/Frm_ModificarBeneficio.vb
	BECA2/UI/Frm_MostrarCurso.Designer.vb
	BECA2/UI/Frm_Principal.Designer.vb
	BECA2/UI/Frm_Principal.resx
	BECA2/UI/Frm_Principal.vb
	BECA2/UI/Frm_SeleccionarCarreras.vb
	BECA2/UI/My Project/Resources.resx
	BECA2/UI/UC_ConsultarBecas.Designer.vb
	BECA2/UI/UC_ConsultarBecas.vb
	BECA2/UI/UC_SeleccionarBeneficios.vb
	BECA2/UI/UC_SeleccionarRequisitos.vb
	BECA2/UI/UI.vbproj
	BECA2/UI/Uc_Becas.vb
	BECA2/UI/Uc_CambiarContrasenna.vb
	BECA2/UI/Uc_Perfil.Designer.vb
	BECA2/UI/Uc_Principal.Designer.vb
	BECA2/UI/Uc_SeleccionarCarreras.vb
Merge remote-tracking branch 'origin/master' into Wen

Conflicts:
	.gitignore
	BECA2/BECA2.sln
	BECA2/BLL/GestorBeca.cs
	BECA2/BLL/GestorCarrera.cs
	BECA2/BLL/GestorCurso.cs
	BECA2/BLL/GestorGeneral.cs
	BECA2/BLL/GestorRequisito.cs
	BECA2/BLL/GestorUsuario.cs
	BECA2/DAL/Bitacoras.cs
	BECA2/DAL/DAL.csproj
	BECA2/DAL/Repositories/BecaRepository.cs
	BECA2/DAL/Repositories/CarreraRepository.cs
	BECA2/DAL/Repositories/CursoRepository.cs
	BECA2/DAL/Repositories/PermisoRepository.cs
	BECA2/DAL/Repositories/RequisitoRepository.cs
	BECA2/DAL/Repositories/RolRepository.cs
	BECA2/EntitiesLayer/Beca.cs
	BECA2/EntitiesLayer/Beneficio.cs
	BECA2/EntitiesLayer/Carrera.cs
	BECA2/EntitiesLayer/Curso.cs
	BECA2/EntitiesLayer/Requisito.cs
	BECA2/EntitiesLayer/Rol.cs
	BECA2/EntitiesLayer/Usuario.cs
	BECA2/UI/App.config
	BECA2/UI/BD_BECA2PROFORMA.Designer.vb
	BECA2/UI/BD_BECA2_Acciones.Designer.vb
	BECA2/UI/Frm_Beca.Designer.vb
	BECA2/UI/Frm_Beca.vb
	BECA2/UI/Frm_BitacoraAcciones.Designer.vb
	BECA2/UI/Frm_CambiarContrasenia.Designer.vb
	BECA2/UI/Frm_CrearBeneficio.vb
	BECA2/UI/Frm_CrearCarrera.vb
	BECA2/UI/Frm_CrearCurso.Designer.vb
	BECA2/UI/Frm_CrearCurso.vb
	BECA2/UI/Frm_CrearRequisito.Designer.vb
	BECA2/UI/Frm_CrearRequisito.vb
	BECA2/UI/Frm_CrearRol.Designer.vb
	BECA2/UI/Frm_CrearRol.vb
	BECA2/UI/Frm_CrearTipoBeca.designer.vb
	BECA2/UI/Frm_CrearTipoBeca.vb
	BECA2/UI/Frm_CrearUsuario.Designer.vb
	BECA2/UI/Frm_CrearUsuario.vb
	BECA2/UI/Frm_ModificarBeneficio.vb
	BECA2/UI/Frm_ModificarCarrera.Designer.vb
	BECA2/UI/Frm_ModificarCarrera.vb
	BECA2/UI/Frm_ModificarCurso.Designer.vb
	BECA2/UI/Frm_ModificarCurso.vb
	BECA2/UI/Frm_ModificarRequisito.vb
	BECA2/UI/Frm_ModificarRol.vb
	BECA2/UI/Frm_ModificarTipoBeca.vb
	BECA2/UI/Frm_Principal.Designer.vb
	BECA2/UI/Frm_ReporteProforma.Designer.vb
	BECA2/UI/Frm_ReporteProforma.vb
	BECA2/UI/Frm_SeleccionarBeneficios.Designer.vb
	BECA2/UI/Frm_SeleccionarBeneficios.vb
	BECA2/UI/Frm_SeleccionarCarreras.Designer.vb
	BECA2/UI/Frm_SeleccionarRequisitos.Designer.vb
	BECA2/UI/Frm_SeleccionarRequisitos.vb
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/AssemblyInfo.vb
	BECA2/UI/My Project/Resources.Designer.vb
	BECA2/UI/My Project/Settings.Designer.vb
	BECA2/UI/My Project/Settings.settings
	BECA2/UI/Pop up/pop_up_error.Designer.vb
	BECA2/UI/UC_ConsultarBecas.Designer.vb
	BECA2/UI/UC_ConsultarBecas.vb
	BECA2/UI/UC_SeleccionarBeneficios.Designer.vb
	BECA2/UI/UC_SeleccionarRequisitos.Designer.vb
	BECA2/UI/UC_SeleccionarRequisitos.vb
	BECA2/UI/UI.vbproj
	BECA2/UI/Uc_Becas.Designer.vb
	BECA2/UI/Uc_Becas.vb
	BECA2/UI/Uc_Beneficios.Designer.vb
	BECA2/UI/Uc_Beneficios.vb
	BECA2/UI/Uc_Carreras.Designer.vb
	BECA2/UI/Uc_Carreras.vb
	BECA2/UI/Uc_Cursos.Designer.vb
	BECA2/UI/Uc_Cursos.vb
	BECA2/UI/Uc_Historiales_Estudiantes.Designer.vb
	BECA2/UI/Uc_Requisitos.Designer.vb
	BECA2/UI/Uc_Requisitos.vb
	BECA2/UI/Uc_Roles.Designer.vb
	BECA2/UI/Uc_Roles.vb
	BECA2/UI/Uc_SeleccionarCarreras.Designer.vb
	BECA2/UI/Uc_SeleccionarCarreras.vb
	BECA2/UI/Uc_TipoBeca.Designer.vb
	BECA2/UI/Uc_TipoBeca.vb
	BECA2/UI/Uc_Usuarios.Designer.vb
	BECA2/UI/Uc_Usuarios.vb
	BECA2/UI/uCMenu.Designer.vb
Merge remote-tracking branch 'origin/esteban-lopez' into Wen
listo
Merge remote-tracking branch 'origin/master' into Wen
Merge remote-tracking branch 'origin/esteban-lopez' into Wen
Merge remote-tracking branch 'origin/esteban-lopez' into Wen