From c059b83f2bd54bd670e9248a16e02bf17af004ca Mon Sep 17 00:00:00 2001
From: mvp76 <mikael.von.pfaler@gmail.com>
Date: Thu, 23 Mar 2017 09:37:33 +0100
Subject: [PATCH] Fix merge conflict

---
 app/src/main/res/layout/app_details2_header.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/layout/app_details2_header.xml b/app/src/main/res/layout/app_details2_header.xml
index afe1dfdb2..f15c02a07 100755
--- a/app/src/main/res/layout/app_details2_header.xml
+++ b/app/src/main/res/layout/app_details2_header.xml
@@ -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"