mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-29 05:43:55 +01:00
Fix conflicts
This commit is contained in:
parent
df884c8f79
commit
0da8b93ebb
3 changed files with 180 additions and 0 deletions
|
|
@ -64,6 +64,8 @@
|
|||
/>
|
||||
</RelativeLayout>
|
||||
<include layout="@layout/bottom_sheet_nearby" />
|
||||
<include layout="@layout/bottom_sheet_details" android:id="@+id/bottom_sheet_details" />
|
||||
|
||||
</android.support.design.widget.CoordinatorLayout>
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue