TH3C0D3R
None
troll31
Optional: How many FP rewards do you get per day? This information is used to calculate profitability for further Arc levels. To get a suggestion go to: Town Hall > News > Event History and scroll through all pages
Optionnel : Combien de récompenses en PFs recevez-vous par jour ? Cette information est utilisée pour calculer la rentabilité sur d'autres niveaux d'Arche plus élevés. Pour obtenir une suggestion, se rendre dans l'Hotel de Ville > Nouvelles > Historique des événements > et défiler toutes les pages
First, 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)4 years ago
Kolega