Merge lp:~inddiana/diana-addons/imp_he_biostar_wizard_marcaje into lp:diana-addons
Proposed by
Mauricio Jose Sanchez Puerta
Status: | Merged |
---|---|
Merged at revision: | 25 |
Proposed branch: | lp:~inddiana/diana-addons/imp_he_biostar_wizard_marcaje |
Merge into: | lp:diana-addons |
Diff against target: |
40 lines (+22/-0) (has conflicts) 1 file modified
diana_integracion_biostar/wizard/horas_marcaje_wizard.py (+22/-0) Text conflict in diana_integracion_biostar/wizard/horas_marcaje_wizard.py |
To merge this branch: | bzr merge lp:~inddiana/diana-addons/imp_he_biostar_wizard_marcaje |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
[SISB] Yennifer Santiago Z | Pending | ||
Review via email: mp+186043@code.launchpad.net |
Description of the change
modificado herencia de la tabla para crear las lineas
To post a comment you must log in.