From a9ae673ba1a25c8a57b51f38e1b27eb0d90e240f Mon Sep 17 00:00:00 2001
From: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date: Thu, 19 Nov 2009 17:34:27 +0100
Subject: [PATCH] followup finishreceive.pl

---
 acqui/finishreceive.pl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index 52962a1574..31c7c3570c 100755
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -115,7 +115,3 @@ if ($quantityrec > $origquantityrec ) {
 	}
 }
     print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
-<<<<<<< HEAD:acqui/finishreceive.pl
-=======
-# >>>>>>> finishreceive:acqui/finishreceive.pl
->>>>>>> 8a2ecbd... merge fix : recieving:acqui/finishreceive.pl
-- 
2.39.5