| Chunk |
|---|
| Conflicting content |
|---|
public Long getRelated() {
return null;
}
<<<<<<< HEAD
=======
>>>>>>> d7300761bae469cd3066fe4e90a981ce6dc8cf60
} |
| Solution content |
|---|
public Long getRelated() {
return null;
}
} |
| File |
|---|
| CreateIpForwardingRuleCmd.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |