Cleaned up some file merge funkiness

Signed-off-by: Bill Erickson <berick@esilibrary.com>

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 6e4f696..b9e77dd 100644 (file)
--- 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(