Solve git conflicts

Signed-off-by: alperozturk <[email protected]>
nextcloud · Feb 22, 2024 · 2a1766c · 2a1766c
1 parent 3780d83
commit 2a1766c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -107,7 +107,7 @@
     </style>
 
     <!-- separate action bar style for activities without an action bar -->
-    <style name="BaseTheme.ownCloud.Toolbar" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="BaseTheme.ownCloud.Toolbar" parent="Theme.AppCompat">
         <item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
         <item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
         <item name="android:colorBackground">@color/bg_default</item>