http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7127
Paul Poulain <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Passed QA |Failed QA --- Comment #5 from Paul Poulain <[email protected]> 2012-01-13 10:49:47 UTC --- QA comment Chris = is there a unit test for XHTML validity ? + merge problem: Applying: Bug 7127 - Templates must be valid XHTML /home/paul/koha.dev/koha-community/.git/rebase-apply/patch:64: space before tab in indent. <a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&q=[% itemloo.itemnumber %]">[% itemloo.countanalytics %] analytics</a> warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... <stdin>:64: space before tab in indent. <a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&q=[% itemloo.itemnumber %]">[% itemloo.countanalytics %] analytics</a> warning: 1 line applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt Failed to merge in the changes. Patch failed at 0001 Bug 7127 - Templates must be valid XHTML -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- 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/
