http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6116
Nicole C. Engard <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Needs Signoff |Does not apply --- Comment #2 from Nicole C. Engard <[email protected]> 2011-05-13 19:43:20 UTC --- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 6116: Adding a child patron Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Renaming koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl => koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tt CONFLICT (rename/modify): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tt Auto-merging members/memberentry.pl CONFLICT (content): Merge conflict in members/memberentry.pl Failed to merge in the changes. Patch failed at 0001 Bug 6116: Adding a child patron 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". nengard@debian:~/kohaclone$ -- 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/
