bmartyAuto-merging vector/src/main/res/values-uk/strings.xml Auto-merging vector/src/main/res/values-sk/strings.xml Auto-merging vector/src/main/res/values-ru/strings.xml Auto-merging vector/src/main/res/values-pl/strings.xml Auto-merging vector/src/main/res/values-nl/strings.xml Auto-merging vector/src/main/res/values-ja/strings.xml Auto-merging vector/src/main/res/values-it/strings.xml CONFLICT (content): Merge conflict in vector/src/main/res/values-it/strings.xml Auto-merging vector/src/main/res/values-eu/strings.xml Auto-merging vector/src/main/res/values-bg/strings.xml Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago