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)
TH3C0D3R
None
mainline