Fix conflicts

This commit is contained in:
neslihanturan 2017-12-11 13:38:35 +03:00 committed by maskara
parent df884c8f79
commit 0da8b93ebb
3 changed files with 180 additions and 0 deletions

View file

@ -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>