Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)
The app needs special rights for the correct display "above" the game. To do this, open the FoE Helper app directly after installation and grant the correct rights:
The app needs special rights for the correct display "over" the game. To do this, open the FoE Helper app directly after installation and grant the correct rights:
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
(1)