http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6698
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Needs Signoff |Does not apply --- Comment #5 from Katrin Fischer <[email protected]> 2011-10-18 05:43:12 UTC --- Sorry Owen - I missed testing this earlier. Patch will doesn't apply using 'git bz apply' and gives me a conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt with 'git am -is3'. Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Fix for Bug 6698, Detail page for organisations should show only valid fields Using index info to reconstruct a base tree... <stdin>:105: trailing whitespace. $template->param( $data->{'category_type'} => 1 ); warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt Auto-merging members/moremember.pl Failed to merge in the changes. Patch failed at 0001 Fix for Bug 6698, Detail page for organisations should show only valid fields -- 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. _______________________________________________ Koha-bugs mailing list [email protected] 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/
