[Scripts] Fixed git merge problem

2023-05-10 10:44:07 +02:00 · 2023-05-10 10:44:07 +02:00 · 950941b5e7
commit 950941b5e7
parent 3264da7a18
1 changed files with 0 additions and 4 deletions
--- a/FreeBSD/storage/zfs-dataset-backup.bash
+++ b/FreeBSD/storage/zfs-dataset-backup.bash
@ -26,10 +26,6 @@ openssl enc -aes-256-ctr -a -pbkdf2 -iter 1000 -salt -k $enc_password \
 > $backup_location/$dataset_name-$backup_date.pigz.enc

 ## delete snapshot
-<<<<<<< HEAD
-#sleep 1
-=======
->>>>>>> 93e0bfb4f86673a87465d127972c447d7c48cfc0
 zfs destroy $dataset_orig@$backup_date

 # report done