X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/95e9c4e6befb17ca3e691c26f024fb55eeae5e31..17b9beb40640e8731143f61e3b94756f3e77d20c:/man/conflict.man

diff --git a/man/conflict.man b/man/conflict.man
index 1af15e31..3f2dc087 100644
--- a/man/conflict.man
+++ b/man/conflict.man
@@ -1,4 +1,4 @@
-.TH CONFLICT %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
+.TH CONFLICT %manext8% "June 24, 2012" "%nmhversion%"
 .\"
 .\" %nmhwarning%
 .\"