Fix merge conflict

This commit is contained in:
mvp76 2017-03-23 09:37:33 +01:00
parent 622a1245dc
commit c059b83f2b

View File

@ -123,8 +123,6 @@
android:id="@+id/button_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@id/icon"
android:layout_toEndOf="@id/icon"
android:layout_toRightOf="@id/icon"