From 379327f9877fb864a77ddf83a0c86c7651d4e099 Mon Sep 17 00:00:00 2001
From: Andreas Romeyke <art1@andreas-romeyke.de>
Date: Mon, 25 Oct 2021 17:21:54 +0200
Subject: [PATCH] - fixed merge artifact

---
 lib/SLUB/LZA/SIPBuilderBagIt.pm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/SLUB/LZA/SIPBuilderBagIt.pm b/lib/SLUB/LZA/SIPBuilderBagIt.pm
index 9d60d9b..9cb62f7 100644
--- a/lib/SLUB/LZA/SIPBuilderBagIt.pm
+++ b/lib/SLUB/LZA/SIPBuilderBagIt.pm
@@ -134,10 +134,6 @@ sub get_marc21_from_catalogue($ppn){
             }
         }
     }
-<<<<<<< HEAD
-=======
-
->>>>>>> 5629056af64faa4dedc456d0e64e48a95d013134
     print_scalar_data( "INFO: Found metadata for PPN '$ppn'", "white");
     return $marc21;
 }
-- 
GitLab