Merge: Update xymus.net to activate the full API for the mobile client
[nit.git] / tests / base_conflict_submodule_name_submodule2 / base_conflict_submodule_name_submodule2.nit
1 import submodule