Remove old gitconfig template condition

2026-03-25 12:20:23 +03:00
parent c9ff8e4e31
commit f64560f80d
1 changed files with 0 additions and 4 deletions
@@ -26,8 +26,4 @@
 [rebase]
 	updateRefs = true
 [merge]
-{{- if eq .chezmoi.hostname "ftpserver" }}
-	conflictstyle = diff3
-{{- else }}
 	conflictstyle = zdiff3
-{{ end }}