Merge zeta.labunix.uqam.ca:prog/nit/zeta-wip into tools
[nit.git] / tests / base_conflict_submodule_name_submodule1 / base_conflict_submodule_name_submodule1.nit
1 import submodule