[Koha-bugs] [Bug 8296] Add descriptive (text) published date field for serials

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8296

Koha Team Lyon 3 <koha at univ-lyon3.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |koha at univ-lyon3.fr

--- Comment #58 from Koha Team Lyon 3 <koha at univ-lyon3.fr> ---
h1>Something went wrong !</h1>Applying: Bug 8296: Add descriptive (text)
published date field for serials Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Serials.pm
CONFLICT (content): Merge conflict in C4/Serials.pm Auto-merging
installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
Auto-merging misc/cronjobs/serialsUpdate.pl Auto-merging
serials/serials-collection.pl Failed to merge in the changes.
Patch failed at 0001 Bug 8296: Add descriptive (text) published date field for
serials When you have resolved this problem run git bz apply --continue.

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