From: Bill Erickson Date: Fri, 22 Jul 2011 16:50:53 +0000 (-0400) Subject: Cleaned up some file merge funkiness X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0013efbeca0563ff045932aa978e8c078517869c;p=evergreen%2Fequinox.git Cleaned up some file merge funkiness Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm index 6e4f696fb7..b9e77dd030 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm @@ -3013,11 +3013,7 @@ sub find_hold_mvr { # TODO return metarcord mvr for M holds my $title = $e->retrieve_biblio_record_entry($tid); -<<<<<<< HEAD:Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm return ( ($no_mvr) ? undef : $U->record_to_mvr($title), $volume, $copy, $issuance, $part, $title ); -======= - return ( ($no_mvr) ? undef : $U->record_to_mvr($title), $volume, $copy, $issuance, $title ); ->>>>>>> a6f2181... added call args to open-ils.circ.hold.details.*.retrieve to allow the caller to scale back the returned data set:Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm } __PACKAGE__->register_method(