Merge: A collection of miscellaneous commits
[nit.git] / tests / base_conflict_submodule_name_submodule1 / base_conflict_submodule_name_submodule1.nit
1 import submodule