Imported Upstream version 3.3.1

[debian/amanda] / man / xml-source / amanda-taperscan.7.xml

diff --git a/man/xml-source/amanda-taperscan.7.xml b/man/xml-source/amanda-taperscan.7.xml
index 6c53d4eafa18fd4a6bb61f5f1d90debbd012fe0c..6882c38c0f401374ad74d06805e150e14ef9a0a7 100644 (file)
--- 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>