nitcc: collect items with conflict (now that there is always a resolution attempt)
[nit.git] / misc / syntaxhighlighter /
2014-02-07 Alexandre Terrasamisc: added brush for SyntaxHighlighter JS script