fix: remove typo in syncoid.conf

openfoodfacts · Feb 8, 2024 · ce309b3 · ce309b3
1 parent 3adc748
commit ce309b3
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/confs/off1/sanoid/syncoid-args.conf b/confs/off1/sanoid/syncoid-args.conf
@@ -11,7 +11,6 @@
 --no-sync-snap --no-privilege-elevation --recursive [email protected]:zfs-hdd/opf zfs-hdd/obf
 # opff
 --no-sync-snap --no-privilege-elevation --recursive [email protected]:zfs-hdd/opff zfs-hdd/opff
-<<<<<<< HEAD
 # off2 rpool backups
 --no-sync-snap --no-privilege-elevation --recursive [email protected]:zfs-hdd/pve zfs-hdd/backups/off2-pve
 # off2 pve backups