Fix mismerge

Change-Id: Ieb568d343a568a2b29297fe9824430ab5e8a4a94
2020-10-17 16:13:36 +02:00 · 2020-10-17 16:13:36 +02:00 · c5f59b9752
parent 6eff36c1a7
commit c5f59b9752
2 changed files with 1 additions and 2 deletions
--- 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" />

--- 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"