Merge remote-tracking branch 'alexis/cpp'
[nit.git] / tests / sav / base_conflict_class_name.res
1 1
2 2