Merge: Intro NitActivity an Android entry point in pure Nit, Java, and C (almost...
[nit.git] / tests / base_conflict_submodule_name_submodule2 /
drwxr-xr-x   ..
-rw-r--r-- 17 base_conflict_submodule_name_submodule2.nit
-rw-r--r-- 725 submodule.nit