[Koha-bugs] [Bug 5336] Acq history search

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

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

mathieu saby <mathieu.saby at univ-rennes2.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |mathieu.saby at univ-rennes2.f
                   |                            |r

--- Comment #6 from mathieu saby <mathieu.saby at univ-rennes2.fr> ---
Patch does not apply.
Could you rebase it please?
M. Saby


Applying: Bug 5336:Order search (search and UI enhancements)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.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
CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql
Auto-merging installer/data/mysql/de-DE/optional/auth_val.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/de-DE/optional/auth_val.sql
Auto-merging acqui/histsearch.pl
CONFLICT (content): Merge conflict in acqui/histsearch.pl
Auto-merging C4/Acquisition.pm
CONFLICT (content): Merge conflict in C4/Acquisition.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 5336:Order search (search and UI enhancements)
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.