You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
stdout:
Auto-merging l10n_ar_afipws_fe/models/account_move.py
CONFLICT (content): Merge conflict in l10n_ar_afipws_fe/models/account_move.py
stderr:
20:09:22.272723 git.c:444 trace: built-in: git cherry-pick bd114fd
error: could not apply bd114fd... [FIX] Fix issue ingadhoc#28 and ingadhoc#32
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:
The text was updated successfully, but these errors were encountered: