https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15505
José-Mario Monteiro-Santos <jose-mario.monteiro-san...@inlibro.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |jose-mario.monteiro-santos@
| |inlibro.com
Status|Needs Signoff |Patch doesn't apply
--- Comment #12 from José-Mario Monteiro-Santos
<jose-mario.monteiro-san...@inlibro.com> ---
Patch doesn't apply
Applying: Bug 15505 - Mark Hold Items 'On hold' instead of 'Available'
.git/rebase-apply/patch:51: trailing whitespace.
}
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M C4/Items.pm
M
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
M koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
M koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
M t/db_dependent/Items.t
.git/rebase-apply/patch:51: trailing whitespace.
}
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Items.t
CONFLICT (content): Merge conflict in t/db_dependent/Items.t
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
Auto-merging C4/Items.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 15505 - Mark Hold Items 'On hold' instead of
'Available'
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
