Merge branch 'triple_quoted_strings'
[nit.git] / tests / base_conflict_submodule_name_submodule1 /
drwxr-xr-x   ..
-rw-r--r-- 17 base_conflict_submodule_name_submodule1.nit
-rw-r--r-- 725 submodule.nit