X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Fconflict.man8;h=dc05548f444779b75be1b6afaacabd3c4026e734;hb=0073224c28bf81dad1812d406bb9915b24b23eb6;hp=4df70944ad541c750e835108f22010f5d5c57eab;hpb=684ec30d81e1223a282764452f4902ed4ad1c754;p=mmh diff --git a/man/conflict.man8 b/man/conflict.man8 index 4df7094..dc05548 100644 --- a/man/conflict.man8 +++ b/man/conflict.man8 @@ -62,7 +62,6 @@ or whenever system accounting takes place. .fc ^ ~ .nf .ta \w'%etcdir%/ExtraBigFileName 'u -^%etcdir%/mts.conf~^nmh mts configuration file ^/etc/passwd~^List of users ^/etc/group~^List of groups ^%bindir%/mhmail~^Program to send mail