X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1b5a1bd2244d3e1c12b7c9e1f48e445de5ad2ea2..2cb94fc491ecfbab796f2287f1be4a2c85a8a46d:/man/conflict.man diff --git a/man/conflict.man b/man/conflict.man index 6cc69442..f6905960 100644 --- a/man/conflict.man +++ b/man/conflict.man @@ -1,6 +1,5 @@ .\" .\" %nmhwarning% -.\" $Id$ .\" .TH CONFLICT %manext8% "%nmhdate%" MH.6.8 [%nmhversion%] .SH NAME