Merge remaining conflicts in .gitattributes

diff --cc .gitattributes
index fb495e8fe4f21c4db7d734d6752aa2379c2c63e1,9e67e02dad3e9351e079f04da4e46f99b004d132..f652cce389f01e8cfac9230d6e7dafd3ce4fdd61
--- 1/.gitattributes
--- 2/.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