GitHub PushEvent at 2014-10-29 12:06:00
Repository: SIS_PP_J23
Actor: SistemaContable
Payload: {"shas":[["46ef5c6d276dc49c65ad310734a9d105d6104cc2","4f5181b58e5253ce8486deed6db06a7783b2301f@Unknown","Merge origin/temp2\n\nConflicts:\n\tbuild.xml\n\tnbproject/build-impl.xml\n\tnbproject/genfiles.properties\n\tnbproject/project.properties\n\tnbproject/project.xml\n\tsrc/Facturacion/GUI_Imprimir_Comprobantes.form\n\tsrc/Facturacion/GUI_Imprimir_Comprobantes.java\n\tsrc/Facturacion/IGUI_Asignar_Pto_Venta_Comprobante.java\n\tsrc/Facturacion/IGUI_Facturar.form\n\tsrc/Facturacion/IGUI_Facturar.java\n\tsrc/Facturacion/IGUI_Productos.form\n\tsrc/Facturacion/IGUI_Productos.java","Manolo",true],["2064b891c0180187b5d8d08d32141a39c8894f4b","4f5181b58e5253ce8486deed6db06a7783b2301f@Unknown","Merge origin/temp2\n\nConflicts:\n\tbuild.xml\n\tnbproject/build-impl.xml\n\tnbproject/genfiles.properties\n\tnbproject/project.properties\n\tnbproject/project.xml\n\tsrc/Facturacion/GUI_Imprimir_Comprobantes.form\n\tsrc/Facturacion/GUI_Imprimir_Comprobantes.java\n\tsrc/Facturacion/IGUI_Asignar_Pto_Venta_Comprobante.java\n\tsrc/Facturacion/IGUI_Facturar.form\n\tsrc/Facturacion/IGUI_Facturar.java\n\tsrc/Facturacion/IGUI_Productos.form\n\tsrc/Facturacion/IGUI_Productos.java","Manolo",true]],"size":2,"ref":"refs/heads/master","head":"2064b891c0180187b5d8d08d32141a39c8894f4b"}