Fix conflicts

This commit is contained in:
neslihanturan 2017-12-13 16:59:09 +03:00 committed by maskara
parent 88cf1bdcd7
commit e15daa15e1
5 changed files with 50 additions and 36 deletions

View file

@ -148,9 +148,10 @@ Description Description Description
Description Description Description
" />
<FrameLayout
android:id="@+id/container_sheet"
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"></FrameLayout>
android:layout_height="48dp"
>
</View>
</LinearLayout>