https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17425
Lari Taskula <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #9 from Lari Taskula <[email protected]> --- After Bug 17226 Applying: Bug 17425: Make Koha::Object raise exceptions Using index info to reconstruct a base tree... M Koha/Object.pm Falling back to patching base and 3-way merge... error: The following untracked working tree files would be overwritten by merge: Koha/Exceptions/Object.pm Please move or remove them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0001 Bug 17425: Make Koha::Object raise exceptions -- 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/
