Asciidoc: Resolve merge conflict

diff --cc man-common/manpage-stub.adoc
index e09c6fdeae55557861ceb161edef6d4ff82bc4ab,4b5b705167a675c68fdadc3ed98f9ea8a96edf0c..714276cf334a8959584561767ce93219172d8075
--- 1/man-common/manpage-stub.adoc
--- 2/man-common/manpage-stub.adoc
+++ b/man-common/manpage-stub.adoc
@@@ -60,11 -40,11 +60,12 @@@ mailto:john.doe@example.com[John Doe
  
  *foo*(1),
  *bar*(1)
 -
++<<<<<<< HEAD
 + 
- include::../man-common/bugreports.adoc[]
+ include::man-common/bugreports.adoc[]
  
- include::../man-common/footer.adoc[]
+ include::man-common/footer.adoc[]
  
  ifdef::translation[]
- include::../man-common/translation.adoc[]
+ include::man-common/translation.adoc[]
  endif::[]