1
0
mirror of https://gitlab.com/openlp/android.git synced 2024-12-22 11:52:49 +00:00

Fix confilct

This commit is contained in:
Tim Bentley 2016-01-10 17:17:44 +00:00
parent d4e195bfbe
commit f2167b2916

View File

@ -7,7 +7,7 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:weightSum="1"> android:weightSum="1">
<TextView <TextView
android:layout_width="315dp" android:layout_width="314dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/display_blank_summary" android:text="@string/display_blank_summary"
@ -23,7 +23,7 @@
android:text="@string/display_reset" android:text="@string/display_reset"
android:id="@+id/buttonReset" android:id="@+id/buttonReset"
android:textSize="20sp" android:textSize="20sp"
android:height="30dp" android:height="40dp"
android:clickable="true" android:clickable="true"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_marginBottom="20dp" /> android:layout_marginBottom="20dp" />