https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26684
Marcel de Rooy <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Passed QA |Patch doesn't apply --- Comment #43 from Marcel de Rooy <[email protected]> --- Applying: Bug 26684: Remove misc/exportauth.pl as a consequence of removing auth_header.marc Using index info to reconstruct a base tree... M misc/exportauth.pl Falling back to patching base and 3-way merge... CONFLICT (modify/delete): misc/exportauth.pl deleted in Bug 26684: Remove misc/exportauth.pl as a consequence of removing auth_header.marc and modified in HEAD. Version HEAD of misc/exportauth.pl left in tree. error: Failed to merge in the changes. Please rebase. I need to rebase another one on top.. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
