# Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt |
||
|---|---|---|
| .. | ||
| attachment-viewer | ||
| core-utils | ||
| diff-match-patch | ||
| jsonviewer | ||
| multipicker | ||
| ui-styles | ||
# Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt |
||
|---|---|---|
| .. | ||
| attachment-viewer | ||
| core-utils | ||
| diff-match-patch | ||
| jsonviewer | ||
| multipicker | ||
| ui-styles | ||