https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18889
Séverine Queune <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #10 from Séverine Queune <[email protected]> --- The 'Simpler counter-patch' doesn't apply. > Applying: Bug 18889: Simpler counter-patch > Using index info to reconstruct a base tree... > M koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt > M members/pay.pl > Falling back to patching base and 3-way merge... > error: Your local changes to the following files would be overwritten by > merge: > members/pay.pl > Please, commit your changes or stash them before you can merge. > Aborting > Failed to merge in the changes. > Patch failed at 0001 Bug 18889: Simpler counter-patch > The copy of the patch that failed is found in: > /var/repositories/koha/.git/rebase-apply/patch Barcode display is good applying only the first patch 'Storing and display of barcode with fines in intranet'. I'm not sure if I can sign or failed it because of the conflict. -- 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/
