| Chunk |
|---|
| Conflicting content |
|---|
public class UserSummary {
<<<<<<< HEAD
public static final UserSummary GHOST = new UserSummary(0, "Spelers uit het verleden", 0,
"http://www.gravatar.com/avatar/0?d=mm&s=30");
=======
public static final UserSummary GHOST = new UserSummary(0, "Previous players", 0,
"/static/img/r2d2-small.png");
>>>>>>> 480cea71781eee3aff9132a9712438b2888d0ebb
private int id;
private String name; |
| Solution content |
|---|
public class UserSummary {
public static final UserSummary GHOST = new UserSummary(0, "Previous players", 0,
"http://www.gravatar.com/avatar/0?d=mm&s=30");
private int id;
private String name; |
| File |
|---|
| UserSummary.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |