fix git conflicts

Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/main/res/drawable/ripple.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Nextcloud - Android Client
-  ~
-  ~ SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
-  ~ SPDX-FileCopyrightText: 2022 Nextcloud GmbH
-  ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/grey_200">
-    <item android:id="@android:id/mask">
-        <shape android:shape="oval">
-            <solid android:color="?android:colorPrimary" />
-        </shape>
-        <color android:color="@color/white" />
-    </item>
-</ripple>

app/src/main/res/values-night/colors.xml

@@ -20,7 +20,6 @@
     <color name="grey_200">#818181</color>
     <color name="nc_grey">#222222</color>
     <color name="icon_on_nc_grey">#ffffff</color>
-    <color name="foreground_highlight">#EAE0E5</color>
 
     <!-- Multiselect backgrounds -->
     <color name="action_mode_background">@color/appbar</color>

app/src/main/res/values/colors.xml

@@ -52,7 +52,6 @@
     <color name="secondary_button_text_color">#000000</color>
     <color name="nc_grey">#ededed</color>
     <color name="icon_on_nc_grey">#000000</color>
-    <color name="foreground_highlight">#1D1B1E</color>
 
     <color name="process_dialog_background">#ffffff</color>
     <color name="indicator_dot_selected">#ffffff</color>

app/src/main/res/values/dims.xml

@@ -78,7 +78,6 @@
     <dimen name="file_download_fragment_display_text_margin">40dp</dimen>
     <dimen name="drawer_width">240dp</dimen>
     <dimen name="grid_item_text_size">16sp</dimen>
-    <dimen name="seek_bar_height">32dp</dimen>
     <dimen name="search_users_groups_layout_width">200dp</dimen>
     <dimen name="search_users_groups_layout_list_view_margin">20dp</dimen>
     <dimen name="share_file_layout_text_size">12sp</dimen>