--- rules~	2012-10-26 11:28:52.000000000 +0100
+++ rules	2012-10-26 11:30:22.000000000 +0100
@@ -294,11 +294,7 @@
 	cp debian/rename $(build)/perl/usr/bin/prename
 	chmod 755 $(build)/perl/usr/bin/prename
 
-<<<<<<< Updated upstream
 	./perl.static -Ilib $(build)/perl-modules/usr/bin/pod2man --official \
-=======
-	./perl.static -Ilib $(build)/perl/usr/bin/pod2man --date "2012-09-24" \
->>>>>>> Stashed changes
 	    debian/rename >$(build)/perl/usr/share/man/man1/prename.1
 
 	# install docs