| Chunk |
|---|
| Conflicting content |
|---|
@Override
public void onEnable(){
<<<<<<< HEAD:src/MinePermit.java
=======
>>>>>>> a11328166037d1d8b31f636e0d7e10c235474afd:net/lotrcraft/minepermit/MinePermit.java
log = this.getLogger();
log.log(null, "Enabling MinePermit version ");
} |
| Solution content |
|---|
@Override
public void onEnable(){
log = this.getLogger();
log.log(null, "Enabling MinePermit version ");
} |
| File |
|---|
| MinePermit.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |