| Chunk |
|---|
| Conflicting content |
|---|
private DateTime orderDate;
private BigDecimal quantity;
private String orderState;
<<<<<<< HEAD
private int atgDocumentId;
private String lspCode;
public int getAtgDocumentId() {
return atgDocumentId;
}
public void setAtgDocumentId(int atgDocumentId) {
this.atgDocumentId = atgDocumentId;
}
=======
private String lspCode;
>>>>>>> f05c8e752a9c45fc2c79e9cebaaddb8ecdb481c8
public SapMomTO getSapIdoc() {
return sapIdoc; |
| Solution content |
|---|
private DateTime orderDate;
private BigDecimal quantity;
private String orderState;
private int atgDocumentId;
private String lspCode;
public int getAtgDocumentId() {
return atgDocumentId;
}
public void setAtgDocumentId(int atgDocumentId) {
this.atgDocumentId = atgDocumentId;
}
public SapMomTO getSapIdoc() {
return sapIdoc; |
| File |
|---|
| ItemTO.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method declaration |