Auto-merging Riot/Assets/zh_Hans.lproj/Vector.strings
CONFLICT (content): Merge conflict in Riot/Assets/zh_Hans.lproj/Vector.strings
Automatic merge failed; fix conflicts and then commit the result.
(1)
Auto-merging Riot/Assets/zh_Hans.lproj/Vector.strings
CONFLICT (content): Merge conflict in Riot/Assets/zh_Hans.lproj/Vector.strings
Automatic merge failed; fix conflicts and then commit the result.
(1)