nitcc: collect items with conflict (now that there is always a resolution attempt)
[nit.git] / c_src / kernel_nit.h
2015-06-12 Jean Privatregern c_src
2014-07-29 Jean Privatc_src: update