From: Mario Blättermann Date: Wed, 31 Mar 2021 15:48:21 +0000 (+0200) Subject: Asciidoc: Remove artifact from merge conflict X-Git-Tag: v2.37-rc2~51^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69378d9bf471c7238ddbea1941704fd09c045658;p=thirdparty%2Futil-linux.git Asciidoc: Remove artifact from merge conflict --- diff --git a/man-common/manpage-stub.adoc b/man-common/manpage-stub.adoc index 714276cf33..7ce055439b 100644 --- a/man-common/manpage-stub.adoc +++ b/man-common/manpage-stub.adoc @@ -60,7 +60,6 @@ mailto:john.doe@example.com[John Doe] *foo*(1), *bar*(1) -<<<<<<< HEAD include::man-common/bugreports.adoc[]