From d4be68191c5342cd205b9a021c96cf9f233d3aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20V=C3=A1gner?= Date: Sat, 28 Sep 2019 18:16:00 +0200 Subject: [PATCH] Fix conflicts after rebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Vágner --- vector/src/main/res/layout/merge_composer_layout.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/vector/src/main/res/layout/merge_composer_layout.xml b/vector/src/main/res/layout/merge_composer_layout.xml index 97ef31eb84..95babeb8c7 100644 --- a/vector/src/main/res/layout/merge_composer_layout.xml +++ b/vector/src/main/res/layout/merge_composer_layout.xml @@ -71,7 +71,6 @@ android:layout_width="22dp" android:layout_height="22dp" android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/action_close" android:src="@drawable/ic_close_round" android:contentDescription="@string/cancel" android:tint="@color/riotx_notice" @@ -90,7 +89,6 @@ android:layout_width="0dp" android:layout_height="0dp" android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/send_attachment" android:src="@drawable/ic_attachment" android:contentDescription="@string/option_send_files" android:tint="?attr/colorAccent" @@ -113,7 +111,6 @@ android:background="?android:attr/selectableItemBackground" android:contentDescription="@string/send" android:src="@drawable/ic_send" - android:contentDescription="@string/send" android:tint="?attr/colorAccent" tools:ignore="MissingConstraints" />