Merge branch 'release_candidate_2021.2' of...

Merge branch 'release_candidate_2021.2' of git.slub-dresden.de:digital-preservation/SLUB_SIP_Builder into release_candidate_2021.2

lib/SLUB/LZA/SIPBuilderBagIt.pm

@@ -134,6 +134,10 @@ sub get_marc21_from_catalogue($ppn){
             }
         }
     }
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5629056af64faa4dedc456d0e64e48a95d013134
     print_scalar_data( "INFO: Found metadata for PPN '$ppn'", "white");
     return $marc21;
 }