Failed merge on repository
[Deprecated] Riot Android / [DEPRECATED] matrix-android-sdk
Removing matrix-sdk/src/main/res/values/dimens.xml Auto-merging matrix-sdk/src/main/res/values-pl/strings.xml Auto-merging matrix-sdk/src/main/res/values-ja/strings.xml CONFLICT (add/add): Merge conflict in matrix-sdk/src/main/res/values-ja/strings.xml Removing matrix-sdk/src/main/res/drawable-xxhdpi/matrix_user.png Automatic merge failed; fix conflicts and then commit the result. (1)
Component locked
Merged repository
Pushed changes
Component unlocked
bmarty