/!\ Big Merge REBASING

2026-01-28 18:08:10 +00:00
parent 4ad36f5cf8
commit 78fd3d03c2
17 changed files with 261 additions and 35 deletions
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #  This file is part of systemd. -> systemctl enable --now systemd-resolved
 #
 #  systemd is free software; you can redistribute it and/or modify it under the
@@ -42,3 +43,5 @@ ReadEtcHosts=yes
 #ResolveUnicastSingleLabel=no
 #StaleRetentionSec=0
 #RefuseRecordTypes=
+=======
+>>>>>>> d378d2f ( /!\ Big Merge REBASING)