NoneFirst, rewinding head to replay your work on top of it... Applying: Currently translated at 99.7% (805 of 807 strings) Using index info to reconstruct a base tree... M js/web/_i18n/en.json Falling back to patching base and 3-way merge... Auto-merging js/web/_i18n/en.json CONFLICT (content): Merge conflict in js/web/_i18n/en.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Currently translated at 99.7% (805 of 807 strings) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)5 years ago
miguel.morais
__nettoreward__ x __arcfactor__% = __bruttoreward__<br>Paid: __paid__<br>Profit: __bruttoreward__ - __paid__ = __profit__
Recompensa = __nettoreward__ <small>(Recompensa bruta)</small> * __arcfactor__% <small>(Bónus da Arca)</small> = __bruttoreward__<br>Pago: __paid__<br>Lucro = __bruttoreward__ <small>(Recompensa)</small> - __paid__ <small>(Pago)</small> = __profit__
Kolega