https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26346
shi-yao.w...@inlibro.com changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #115 from shi-yao.w...@inlibro.com --- Patch doesn't apply. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 26346: Database changes Applying: Bug 26346: Updated schema file Applying: Bug 26346: Add option to make public lists editable by all staff Using index info to reconstruct a base tree... M Koha/Patron.pm M koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc M t/db_dependent/Koha/Patron.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/Patron.t Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc Auto-merging Koha/Patron.pm CONFLICT (content): Merge conflict in Koha/Patron.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 26346: Add option to make public lists editable by all staff -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org https://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/