Resolve merge conflicts with master
[nit.git] / tests / sav / opts.res