Fix merge conflicts

[netatalk.git] / man / man8 / psf.8.tmpl

diff --git a/man/man8/psf.8.tmpl b/man/man8/psf.8.tmpl
index b53d5adefef19bee0d4aaf74df36e191e66a347f..18913946b3dd389a317c82ecb9e01af15671d69f 100644 (file)
--- a/man/man8/psf.8.tmpl
+++ b/man/man8/psf.8.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: psf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 17 Dec 1991
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1