https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14866
Maryse Simard <maryse.sim...@inlibro.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |maryse.sim...@inlibro.com
--- Comment #10 from Maryse Simard <maryse.sim...@inlibro.com> ---
Patch doesn't apply
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 14866: Make high holds work with different item types
.git/rebase-apply/patch:88: space before tab in indent.
</tr>
.git/rebase-apply/patch:89: space before tab in indent.
[% END %]
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M C4/Circulation.pm
M admin/smart-rules.pl
M koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
.git/rebase-apply/patch:88: space before tab in indent.
</tr>
.git/rebase-apply/patch:89: space before tab in indent.
[% END %]
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
Auto-merging admin/smart-rules.pl
CONFLICT (content): Merge conflict in admin/smart-rules.pl
Auto-merging C4/Circulation.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 14866: Make high holds work with different item types
--
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/
