From c5f59b975250a216189bfeb4f9a3a7cb1e13aa1e Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 17 Oct 2020 16:13:36 +0200
Subject: [PATCH] Fix mismerge

Change-Id: Ieb568d343a568a2b29297fe9824430ab5e8a4a94
---
 vector/src/main/res/layout/item_bottom_sheet_action.xml | 1 -
 vector/src/main/res/menu/home.xml                       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index f082d6b1db..b3c8d27af3 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -67,7 +67,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible"
-        app:tint="@color/riotx_accent"
         app:tint="?colorAccent"
         tools:ignore="MissingPrefix" />
 
diff --git a/vector/src/main/res/menu/home.xml b/vector/src/main/res/menu/home.xml
index 389c518471..38c1955693 100644
--- a/vector/src/main/res/menu/home.xml
+++ b/vector/src/main/res/menu/home.xml
@@ -2,13 +2,13 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-<!--
     <item
         android:id="@+id/menu_home_setting"
         android:icon="@drawable/ic_settings_x"
         android:title="@string/settings"
         app:showAsAction="never" />
 
+<!--
     <item
         android:id="@+id/menu_home_suggestion"
         android:icon="@drawable/ic_material_bug_report"