[Koha-bugs] [Bug 14576] Allow arbitrary automatic update of location on checkin

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14576

Claire Gravely <claire_gravely at hotmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |claire_gravely at hotmail.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #84 from Claire Gravely <claire_gravely at hotmail.com> ---
does not apply :(

M       C4/Circulation.pm
M       C4/Items.pm
M       C4/Reserves.pm
M       C4/UsageStats.pm
M       circ/returns.pl
M       installer/data/mysql/sysprefs.sql
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
M       koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging circ/returns.pl
Auto-merging C4/UsageStats.pm
Auto-merging C4/Reserves.pm
Auto-merging C4/Items.pm
Auto-merging C4/Circulation.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 14576: Allow arbitrary automatic update of location on
checkin

-- 
You are receiving this mail because:
You are watching all bug changes.