Projects >> Courier >>e9de1068b5e66bc3ded52b12aa4be98dd5635d5f

Chunk
Conflicting content
        }
        return currentVersion;
    }
<<<<<<< HEAD

    // if plugin second stage doesn't load, we'll register all commands to this null method instead of CourierCommands
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        return true;
    }
}
=======
}
>>>>>>> a394db4d9d817ed1a0270d8864f39e983d5c65c1
Solution content
        }
        return currentVersion;
    }

    // if plugin second stage doesn't load, we'll register all commands to this null method instead of CourierCommands
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        return true;
    }
}
File
Courier.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration