Merge branch 'master' of /Users/karim/Code/AndroidProjects/Phonograph with conflicts.
This commit is contained in:
parent
178c15dafb
commit
e7769b8c5d
3 changed files with 5 additions and 22 deletions
|
|
@ -8,7 +8,6 @@
|
|||
android:id="@+id/recycler_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:clipToPadding="false"
|
||||
android:scrollbars="none" />
|
||||
|
||||
<TextView
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue