[Koha-bugs] [Bug 5928] Allow selection of "purchase for" library in Purchase Suggestions

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Thu Apr 7 10:14:50 CEST 2011


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

claire.hernandez at biblibre.com <claire.hernandez at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |claire.hernandez at biblibre.c
                   |                            |om
       Patch Status|Needs Signoff               |Does not apply

--- Comment #10 from claire.hernandez at biblibre.com <claire.hernandez at biblibre.com> 2011-04-07 08:14:50 UTC ---
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=3404
Attachement 3404: conflits

--------------------------
Bug 5928 :wr77152 : AllowPurchaseSuggestionBranchChoice sys pref
--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 5928 :wr77152 : AllowPurchaseSuggestionBranchChoice sys pref
Using index info to reconstruct a base tree...
<stdin>:26: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging admin/systempreferences.pl
Auto-merging installer/data/mysql/en/mandatory/sysprefs.sql
CONFLICT (content): Merge conflict in
installer/data/mysql/en/mandatory/sysprefs.sql
Auto-merging installer/data/mysql/updatedatabase.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
Auto-merging koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
Failed to merge in the changes.
Patch failed at 0001 Bug 5928 :wr77152 : AllowPurchaseSuggestionBranchChoice
sys pref

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.


More information about the Koha-bugs mailing list