| Chunk |
|---|
| Conflicting content |
|---|
*
* @goal test
* @phase test
<<<<<<< HEAD
* @requiresDependencyResolution test
=======
* @threadSafe
>>>>>>> 746984a01ddc1e3e35c3d4b2344f220d8ac808d3
*/
public class JooTestMojo extends JooTestMojoBase {
|
| Solution content |
|---|
*
* @goal test
* @phase test
* @requiresDependencyResolution test
* @threadSafe
*/
public class JooTestMojo extends JooTestMojoBase {
|
| File |
|---|
| JooTestMojo.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Comment |