Eliminando los proyectos
Merge remote-tracking branch 'origin/esteban-lopez'
Integrando proyecto
Merge remote-tracking branch 'origin/esteban-lopez'
Integrando proyecto
Merge remote-tracking branch 'origin/master' into marco-rodriguez
Merge remote-tracking branch 'origin/master' into marco-rodriguez
Merge branch 'marco-rodriguez' of https://github.com/KOIP2/AplicacionBeca2-KOI into marco-rodriguez
Solución completa
Merge remote-tracking branch 'origin/esteban-lopez'
Merge remote-tracking branch 'origin/master' into marco-rodriguez
Jorge

Creación del menú
Cambio en menú

Cambio en menú
Formulario Crear Carrera
Beca2

Cambio en menu y cambio visual al form, inclui la carpeta resource con
las imagenes que se van a usar
Avance Crear Carrera

Interfaz de Usuario y Logica
REPARANDO CONFLICTOS
Merge remote-tracking branch 'origin/marco-rodriguez'

Conflicts:
	BECA2/BLL/BLL.csproj
	BECA2/EntitiesLayer/EntitiesLayer.csproj
	BECA2/EntitiesLayer/IEntity.cs
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/UI.vbproj
Merge remote-tracking branch 'origin/jorge.argds' into esteban-lopez

Conflicts:
	BECA2/BLL/BLL.csproj
	BECA2/EntitiesLayer/EntitiesLayer.csproj
	BECA2/EntitiesLayer/IEntity.cs
	BECA2/UI/My Project/Application.Designer.vb
	BECA2/UI/My Project/Application.myapp
	BECA2/UI/UI.vbproj

Merge branch 'master' of https://github.com/KOIP2/AplicacionBeca2-KOI

REPARANDO CONFLICTOS
Merge remote-tracking branch
'origin/marco-rodriguez'

Conflicts:
	BECA2/BLL/BLL.csproj
	BECA2/EntitiesLayer/EntitiesLayer.csproj
	BECA2/EntitiesLayer/IEntity.cs
	BECA2/UI/My
Project/Application.Designer.vb
	BECA2/UI/My
Project/Application.myapp
	BECA2/UI/UI.vbproj

Beca2

Cambio en menu y cambio visual al form, inclui la carpeta
resource con
las imagenes que se van a usar

Cambio en menú

Cambio en menú

Jorge

Creación del menú

Merge remote-tracking branch 'origin/esteban-lopez'

Merge remote-tracking branch 'origin/esteban-lopez'

Merge remote-tracking branch 'origin/esteban-lopez'
Correcciones
proy

gg