http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13642
--- Comment #70 from Héctor Eduardo Castro Avalos <[email protected]> --- (In reply to Marc Véron from comment #68) > Sorry, I got conflicts while applying: > > Falling back to patching base and 3-way merge... > Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt > Auto-merging debian/control > CONFLICT (content): Merge conflict in debian/control > Auto-merging C4/Installer/PerlDependencies.pm > CONFLICT (content): Merge conflict in C4/Installer/PerlDependencies.pm > Failed to merge in the changes. I fixed it up. Please Marc apply patch again. If does not work, I miss the point in debian/control about libdevel-cover-perl. -- 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/
