Merge: Include extra Java files in a project
[nit.git] / contrib / nitcc / tests / sav / conflict-dangling.1alt1.alt2.res
1 Error: there is conflicts