GitHub PushEvent at 2014-09-19 16:03:17
Repository: mtop
Actor: carlisromero
Payload: {"shas":[["c5754a1cb9933be0a7a7dd320109736bed3b7aa9","fa228705d1962f0b827ef1b0ef3d48b2dc068099@carlis-Satellite-M645","Merge origin/master\n\nConflicts:\n\tsrc/main/webapp/paginas/admin/bussinesentitytype/list.xhtml\n\tsrc/main/webapp/paginas/admin/planMantenimiento/crear.xhtml","carlis",true],["624c2c0784fd6b43f4e239fc169ed3b5ac95243b","fa228705d1962f0b827ef1b0ef3d48b2dc068099@carlis-Satellite-M645","Merge origin/master\n\nConflicts:\n\tsrc/main/webapp/paginas/admin/planMantenimiento/lista.xhtml\n\tsrc/main/webapp/paginas/secretario/requisicion/crear.xhtml","carlis",true]],"size":2,"ref":"refs/heads/master","head":"624c2c0784fd6b43f4e239fc169ed3b5ac95243b"}