nitcc: collect items with conflict (now that there is always a resolution attempt)
[nit.git] / LICENSE-BSD
2012-02-14 Jean Privatupdate NOTICE and LICENSE