remove rounded corners and fix Picture-in-Picture

2025-10-27 16:14:36 +01:00
parent ebca834f9f
commit 212339f7e2
3 changed files with 6 additions and 2 deletions
--- a/home-manager/.gitconfig
+++ b/home-manager/.gitconfig
@@ -26,6 +26,8 @@
 [rerere]
    enabled = true
    autoupdate = true
+[merge]
+  conflictstyle = diff3
 [mergetool]
    keeptemporaries = false
    keepbackups = false