http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3478 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |m.de.rooy@rijksmuseum.nl Patch Status|Needs Signoff |Does not apply --- Comment #3 from M. de Rooy <m.de.rooy@rijksmuseum.nl> 2011-02-24 12:44:52 UTC --- Question: Is this the same as branch origin/new/ptfs_patron_features ? If so, it does not apply: Auto-merged C4/Accounts.pm Auto-merged C4/Members.pm Auto-merged circ/circulation.pl Auto-merged koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc Auto-merged koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl Auto-merged members/member.pl CONFLICT (content): Merge conflict in members/member.pl Auto-merged members/memberentry.pl Auto-merged members/members-home.pl Automatic merge failed; fix conflicts and then commit the result. If it is not the same, please attach current information to find it. -- 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.