nitcc: collect items with conflict (now that there is always a resolution attempt)
[nit.git] / lib / binary /
drwxr-xr-x   ..
-rw-r--r-- 9059 binary.nit
-rw-r--r-- 321 project.ini
-rw-r--r-- 12509 serialization.nit