dot

packages and services management
Log | Files | Refs | README

commit a52d5e7405d833942fc3867c4f2c4d54e076656b
parent 52d75d86bc9025c449d5ba5cf81d6af9f58526fd
Author: Charlie Root <mail@josuah.net>
Date:   Sun, 22 Jul 2018 23:21:26 +0200

fixed previous merge

Diffstat:
Ms6/qmail-send/run | 4----
1 file changed, 0 insertions(+), 4 deletions(-)

diff --git a/s6/qmail-send/run b/s6/qmail-send/run @@ -5,8 +5,4 @@ fdmove -c 2 1 s6-envdir ./env/ importas MAILDIR MAILDIR -<<<<<<< HEAD:s6/qmail-start/run -qmail-start /var/qmail -======= qmail-start $MAILDIR ->>>>>>> b8e8dd691657b3ab3d91cc7c3e9358584ac563cb:s6/qmail-send/run