http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8296
I'm just a bot <git...@bugs.koha-community.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |git...@bugs.koha-community.
| |org
--- Comment #46 from I'm just a bot <git...@bugs.koha-community.org> ---
Applying: Bug 8296: Add descriptive (text) published date field for serials
Using index info to reconstruct a base tree...
M C4/Serials.pm
M installer/data/mysql/kohastructure.sql
M installer/data/mysql/updatedatabase.pl
M koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
M koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
M koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
M serials/serials-edit.pl
Falling back to patching base and 3-way merge...
Auto-merging serials/serials-edit.pl
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
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 installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging C4/Serials.pm
Patch failed at 0001 Bug 8296: Add descriptive (text) published date field for
serials
The copy of the patch that failed is found in:
/home/christopher/git/koha/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
--
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/
