Fix conflicts

This commit is contained in:
neslihanturan 2018-03-06 19:47:18 +03:00
commit 5b88111289
324 changed files with 9238 additions and 2883 deletions

View file

@ -9,6 +9,7 @@
app:behavior_peekHeight="72dp"
app:behavior_hideable="true"
android:visibility="gone"
>
<LinearLayout