# Conflicts: # CHANGES.md # vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt |
||
|---|---|---|
| .. | ||
| sampledata | ||
| signature | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| lint.xml | ||
| proguard-rules.pro | ||
# Conflicts: # CHANGES.md # vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt |
||
|---|---|---|
| .. | ||
| sampledata | ||
| signature | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| lint.xml | ||
| proguard-rules.pro | ||