From 6cbb8d0fa35bb6a5b5de7ac7882e0de233b7073b Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 5 Dec 2019 06:32:25 -0500
Subject: [PATCH] Bug 20256: (QA follow-up) Filter out branchcodes the user has
 no permissions for

Signed-off-by: Bob Bennhoff - CLiC <bbennhoff@clicweb.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 cataloguing/additem.pl | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index 7a828a93b8..4c2985f636 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -473,14 +473,7 @@ if ($op eq "additem") {
         push @errors,"barcode_not_unique";
         $current_item = $item->unblessed; # Restore edit form for the same item
     } else {
-<<<<<<< HEAD
         my $newitemlost = $item->itemlost;
-=======
-        my $newitem = ModItemFromMarc($itemtosave, $biblionumber, $itemnumber);
-        $itemnumber = q{};
-        my $olditemlost = $item->itemlost;
-        my $newitemlost = $newitem->{itemlost};
->>>>>>> 5b37193b6fe (Bug 20256: (QA follow-up) Redirect to record details page if user cannot edit this item)
         if ( $newitemlost && $newitemlost ge '1' && !$olditemlost ) {
             LostItem( $item->itemnumber, 'additem' );
         }
-- 
2.30.2