[Koha-bugs] [Bug 7736] Edifact QUOTE and ORDER functionality
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Thu Mar 3 15:02:36 CET 2016
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7736
Nicole C. Engard <nengard at gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
--- Comment #136 from Nicole C. Engard <nengard at gmail.com> ---
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 7736: Support Ordering via Edifact EDI messages
Using index info to reconstruct a base tree...
M C4/Acquisition.pm
M C4/Installer/PerlDependencies.pm
M installer/data/mysql/kohastructure.sql
M installer/data/mysql/sysprefs.sql
M koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
M koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
M koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
<stdin>:6102: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
Auto-merging installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging C4/Installer/PerlDependencies.pm
CONFLICT (content): Merge conflict in C4/Installer/PerlDependencies.pm
Auto-merging C4/Acquisition.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 7736: Support Ordering via Edifact EDI messages
The copy of the patch that failed is found in:
/home/vagrant/kohaclone/.git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in /tmp/Amended-patch-hYhFhR.patch
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list