Lp 1731021: Clean up on aisle 9!

Get rid of conflict markers and trailing whitespace in Dan's previous
commit.

Signed-off-by: Jason Stephenson <jason@sigio.com>

diff --git a/Open-ILS/examples/oils_sip.xml.example b/Open-ILS/examples/oils_sip.xml.example
index 0b5b3ec..45fce9c 100644 (file)
--- a/Open-ILS/examples/oils_sip.xml.example
+++ b/Open-ILS/examples/oils_sip.xml.example
@@ -29,12 +29,12 @@
        </listeners>
 
        <accounts>
-               <!-- 
-               Fine Item Detail returned by the Patron Information Request is  
-               manufacturer-specific.  We support the following formats: 
+               <!--
+               Fine Item Detail returned by the Patron Information Request is
+               manufacturer-specific.  We support the following formats:
                3m,  Swyer_A, Swyer_B, and EG_Legacy (default)
                Specify which treatment you want in the av_format attribute.
-               For example: <login id="sc" password="pwd" institution="main" av_format="3m"> 
+               For example: <login id="sc" password="pwd" institution="main" av_format="3m">
                 -->
 
                <login id="scclient" password="clientpwd" institution="gapines"/>
@@ -138,10 +138,7 @@
                                                flag instead of always returning not-OK
                                        <option name='patron_calculate_recal_ok' value='true' />
                                        -->
-<<<<<<< Updated upstream
 
-=======
->>>>>>> Stashed changes
                                </options>
 
                 <checkin_override>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
index 1d8fc30..15b92ca 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
@@ -847,8 +847,6 @@ sub fine_items {
     my ($self, $start, $end, $ids_only) = @_;
     my @fines;
     eval {
-<<<<<<< Updated upstream
-=======
        my $login = OpenILS::SIP->login_account();
        $AV_format_orig = $login->{av_format} || '';
        $AV_format_orig = "eg_legacy" if $AV_format_orig == '';
@@ -865,7 +863,6 @@ sub fine_items {
            $AV_format = "eg_legacy";
        }
 
->>>>>>> Stashed changes
        my $xacts = $U->simplereq('open-ils.actor', 'open-ils.actor.user.transactions.history.have_balance', $self->{authtoken}, $self->{user}->id);
        foreach my $xact (@{$xacts}) {
            if ($ids_only) {