From: Mario Blättermann <mario.blaettermann@gmail.com>
Date: Wed, 31 Mar 2021 15:46:27 +0000 (+0200)
Subject: Asciidoc: Resolve merge conflict
X-Git-Tag: v2.37-rc2~51^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67467c9891f72f191de72e5abc80905eed2e6357;p=thirdparty%2Futil-linux.git

Asciidoc: Resolve merge conflict
---

67467c9891f72f191de72e5abc80905eed2e6357
diff --cc man-common/manpage-stub.adoc
index e09c6fdeae,4b5b705167..714276cf33
--- a/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::[]