# Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt |
||
|---|---|---|
| .. | ||
| attachment-viewer | ||
| core-utils | ||
| diff-match-patch | ||
| jsonviewer | ||
| multipicker | ||
| ui-styles | ||
# Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt |
||
|---|---|---|
| .. | ||
| attachment-viewer | ||
| core-utils | ||
| diff-match-patch | ||
| jsonviewer | ||
| multipicker | ||
| ui-styles | ||