| Chunk |
|---|
| Conflicting content |
|---|
*/ public String getUser(); <<<<<<< HEAD ======= /** * Get the reported username for this job. * * @return the username */ public String getUser(); >>>>>>> 652075be14c8ef43ca22f193dc1b50b7e3090a2e } |
| Solution content |
|---|
/** * Get the reported username for this job. * * @return the username */ public String getUser(); } |
| File |
|---|
| Job.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method interface |