nitcc: collect items with conflict (now that there is always a resolution attempt)
[nit.git] / lib / json / .gitattributes
2014-04-25 Alexis Laferrièrelib: rename simple_json_reader as json::static