bmartyAuto-merging vector/src/main/res/values-zh-rTW/strings.xml Auto-merging vector/src/main/res/values-zh-rCN/strings.xml CONFLICT (content): Merge conflict in vector/src/main/res/values-zh-rCN/strings.xml Auto-merging vector/src/main/res/values-ru/strings.xml Auto-merging vector/src/main/res/values-es/strings.xml Auto-merging vector/src/main/res/values-ar/strings.xml Removing vector/src/main/res/drawable-xxxhdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-xxxhdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-xxhdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-xxhdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-xxhdpi/icons_settings.png Removing vector/src/main/res/drawable-xhdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-xhdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-mdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-mdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-hdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-hdpi/message_notification_transparent.png Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago
Auto-merging vector/src/main/res/values-zh-rTW/strings.xml Auto-merging vector/src/main/res/values-zh-rCN/strings.xml CONFLICT (content): Merge conflict in vector/src/main/res/values-zh-rCN/strings.xml Auto-merging vector/src/main/res/values-ru/strings.xml Auto-merging vector/src/main/res/values-es/strings.xml Auto-merging vector/src/main/res/values-ar/strings.xml Removing vector/src/main/res/drawable-xxxhdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-xxxhdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-xxhdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-xxhdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-xxhdpi/icons_settings.png Removing vector/src/main/res/drawable-xhdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-xhdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-mdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-mdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-hdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-hdpi/message_notification_transparent.png Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago
Auto-merging vector/src/main/res/values-zh-rTW/strings.xml Auto-merging vector/src/main/res/values-zh-rCN/strings.xml CONFLICT (content): Merge conflict in vector/src/main/res/values-zh-rCN/strings.xml Auto-merging vector/src/main/res/values-ru/strings.xml Auto-merging vector/src/main/res/values-es/strings.xml Auto-merging vector/src/main/res/values-ar/strings.xml Removing vector/src/main/res/drawable-xxxhdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-xxxhdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-xxhdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-xxhdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-xxhdpi/icons_settings.png Removing vector/src/main/res/drawable-xhdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-xhdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-mdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-mdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-hdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-hdpi/message_notification_transparent.png Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago
Auto-merging vector/src/main/res/values-zh-rTW/strings.xml Auto-merging vector/src/main/res/values-zh-rCN/strings.xml CONFLICT (content): Merge conflict in vector/src/main/res/values-zh-rCN/strings.xml Auto-merging vector/src/main/res/values-ru/strings.xml Auto-merging vector/src/main/res/values-es/strings.xml Auto-merging vector/src/main/res/values-ar/strings.xml Removing vector/src/main/res/drawable-xxxhdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-xxxhdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-xxhdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-xxhdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-xxhdpi/icons_settings.png Removing vector/src/main/res/drawable-xhdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-xhdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-mdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-mdpi/message_notification_transparent.png Removing vector/src/main/res/drawable-hdpi/permanent_notification_transparent.png Removing vector/src/main/res/drawable-hdpi/message_notification_transparent.png Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago