http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10858
M. de Rooy <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #73 from M. de Rooy <[email protected]> --- CONFLICT (add/add): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/lib/jquery/plugins/jquery.cookie.min.js Auto-merging koha-tmpl/opac-tmpl/bootstrap/js/basket.js Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt -- 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/
