https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19008
--- Comment #36 from Magnus Enger <[email protected]> --- I have: - Resolved a pretty trivial conflict: $ git bz apply 19008 Bug 19008 - More database cleanups 71771 - Bug 19008 - More database cleanups - statistics 71772 - Bug 19008 - More database cleanups - deleted catalog 71773 - Bug 19008 - More database cleanups - deleted patrons 71774 - Bug 19008 - More database cleanups - old issues 71775 - Bug 19008 - More database cleanups - old reserves 71776 - Bug 19008 - More database cleanups - item transfers Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19008 - More database cleanups - statistics Using index info to reconstruct a base tree... M misc/cronjobs/cleanup_database.pl Falling back to patching base and 3-way merge... Auto-merging misc/cronjobs/cleanup_database.pl CONFLICT (content): Merge conflict in misc/cronjobs/cleanup_database.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 19008 - More database cleanups - statistics Use 'git am --show-current-patch' to see the failed patch - Tried to add POD as suggested by the fine QA folks Not sure if this should be Needs signoff or Signed off, setting it to the former. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ 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/
