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

Maryse Simard <[email protected]> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[email protected]
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #14 from Maryse Simard <[email protected]> ---
Patch doesn't apply

Applying: Bug 22188: Use publication date as numbering pattern
Using index info to reconstruct a base tree...
M       C4/Serials.pm
M       koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
M       koha-tmpl/intranet-tmpl/prog/js/subscription-add.js
M       serials/serials-collection.pl
M       serials/showpredictionpattern.pl
M       serials/subscription-add.pl
Falling back to patching base and 3-way merge...
Auto-merging serials/subscription-add.pl
Auto-merging serials/showpredictionpattern.pl
Auto-merging serials/serials-collection.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/js/subscription-add.js
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
Auto-merging C4/Serials.pm
Applying: Bug 22188: (follow-up) Introducing dateformat field and other fixes
fatal: sha1 information is lacking or useless (C4/Serials.pm).
error: could not build fake ancestor
Patch failed at 0001 Bug 22188: (follow-up) Introducing dateformat field and
other fixes

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
[email protected]
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/

Reply via email to