From f64560f80dc791d324ffea58e54a74b29fa070ad Mon Sep 17 00:00:00 2001
From: void <void.sp@gmail.com>
Date: Wed, 25 Mar 2026 12:20:23 +0300
Subject: [PATCH] Remove old gitconfig template condition

---
 dot_gitconfig.tmpl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 68a016a..09513c6 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -26,8 +26,4 @@
 [rebase]
 	updateRefs = true
 [merge]
-{{- if eq .chezmoi.hostname "ftpserver" }}
-	conflictstyle = diff3
-{{- else }}
 	conflictstyle = zdiff3
-{{ end }}