Commit 7bbe918
committed
Cherry pick of da5e436 failed
stdout:
CONFLICT (modify/delete): l10n_uy_edi_stock/models/stock_picking.py deleted in a41874504b712b54cbbf3422ffb31926ac6fba3f and modified in da5e436. Version da5e436 of l10n_uy_edi_stock/models/stock_picking.py left in tree.
Auto-merging l10n_uy_ux/models/l10n_uy_edi_document.py
stderr:
closes ingadhoc#413
Signed-off-by: Katherine Zaoral - kz (#l10n) <kz@adhoc.com.ar>
Signed-off-by: Julia Elizondo - jue (#l10n) <jue@adhoc.com.ar>1 parent 4c70aa7 commit 7bbe918
1 file changed
Lines changed: 12 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
1 | 2 | | |
2 | 3 | | |
3 | 4 | | |
| |||
158 | 159 | | |
159 | 160 | | |
160 | 161 | | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
161 | 173 | | |
162 | 174 | | |
163 | 175 | | |
| |||
0 commit comments