X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=man%2Fxml-source%2Famanda-taperscan.7.xml;h=6882c38c0f401374ad74d06805e150e14ef9a0a7;hb=refs%2Ftags%2Fupstream%2F3.3.1;hp=6c53d4eafa18fd4a6bb61f5f1d90debbd012fe0c;hpb=cd0b924f27312d57bd42f6c4fae2b795139e2d0b;p=debian%2Famanda

diff --git a/man/xml-source/amanda-taperscan.7.xml b/man/xml-source/amanda-taperscan.7.xml
index 6c53d4e..6882c38 100644
--- a/man/xml-source/amanda-taperscan.7.xml
+++ b/man/xml-source/amanda-taperscan.7.xml
@@ -152,7 +152,6 @@ is found in the inventory.</para>
 <para>See <amkeyword>oldest</amkeyword>, above, for a definition of acceptable
 volumes.</para>
 
->>>>>>> 6a40a39... manpage edits
 </refsect2>
 
 </refsect1>