X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Fconflict.man;h=3f2dc087dd31cc9ddc906db6b24a99467957c3a6;hb=d1cb667bddf8d1c5c0721fc7ab642c22946baf1f;hp=1af15e31e142ba0b96e2cacb8204e842480071e0;hpb=0f0af4e32a4d734209c16282b63f7cb1094e2699;p=mmh

diff --git a/man/conflict.man b/man/conflict.man
index 1af15e3..3f2dc08 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%
 .\"