Auto-merging js/web/_i18n/sv.json Auto-merging js/web/_i18n/ru.json Auto-merging js/web/_i18n/nl.json CONFLICT (content): Merge conflict in js/web/_i18n/nl.json Auto-merging js/web/_i18n/hu.json Auto-merging js/web/_i18n/fr.json CONFLICT (content): Merge conflict in js/web/_i18n/fr.json Auto-merging js/web/_i18n/en.json CONFLICT (content): Merge conflict in js/web/_i18n/en.json Auto-merging js/web/_i18n/de.json CONFLICT (content): Merge conflict in js/web/_i18n/de.json Auto-merging js/web/_i18n/cs.json CONFLICT (content): Merge conflict in js/web/_i18n/cs.json Automatic merge failed; fix conflicts and then commit the result. (1)2 years ago
Auto-merging js/web/_i18n/sv.json Auto-merging js/web/_i18n/ru.json Auto-merging js/web/_i18n/nl.json CONFLICT (content): Merge conflict in js/web/_i18n/nl.json Auto-merging js/web/_i18n/hu.json Auto-merging js/web/_i18n/fr.json CONFLICT (content): Merge conflict in js/web/_i18n/fr.json Auto-merging js/web/_i18n/en.json CONFLICT (content): Merge conflict in js/web/_i18n/en.json Auto-merging js/web/_i18n/de.json CONFLICT (content): Merge conflict in js/web/_i18n/de.json Auto-merging js/web/_i18n/cs.json CONFLICT (content): Merge conflict in js/web/_i18n/cs.json Automatic merge failed; fix conflicts and then commit the result. (1)2 years ago