Asciidoc: Remove artifact from merge conflict

diff --git a/man-common/manpage-stub.adoc b/man-common/manpage-stub.adoc
index 714276cf334a8959584561767ce93219172d8075..7ce055439b7c5e90b08059c0ce7bd9f4529ea738 100644 (file)
--- 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[]