resoving merge

This commit is contained in:
2022-04-08 18:25:53 +03:00
10 changed files with 137 additions and 173 deletions

View File

@ -164,7 +164,7 @@
<GridView
android:id="@+id/gridView1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:background="#999999"
android:drawSelectorOnTop="false"
android:horizontalSpacing="0dp"