From: Shane Jaroch <chown_tee@proton.me>
Date: Tue, 20 Jan 2026 20:00:30 +0000 (-0500)
Subject: Merge remaining conflicts in .gitattributes
X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=a5c51c24b0b3c73ac5ea7ed30e4cf7873ab67d94;p=nutratech%2Fvps-root.git

Merge remaining conflicts in .gitattributes
---

a5c51c24b0b3c73ac5ea7ed30e4cf7873ab67d94
diff --cc .gitattributes
index fb495e8,9e67e02..f652cce
--- a/.gitattributes
+++ b/.gitattributes
@@@ -8,5 -8,7 +8,6 @@@ etc/sudoers.d/** filter=git-crypt diff=
  etc/systemd/system/*.service filter=git-crypt diff=git-crypt
  etc/postfix/main.cf filter=git-crypt diff=git-crypt
  
 -/etc/gitea/app.ini filter=git-crypt diff=git-crypt
 -
 +etc/gitea/app.ini filter=git-crypt diff=git-crypt
+ opt/stalwart/etc/config.toml filter=git-crypt diff=git-crypt