Projects >> jcommune >>af33099bc8dd6f3da154ae89013d00195e90d11b

Chunk
Conflicting content 
     * {@inheritDoc}
     */
    @Override
<<<<<<< HEAD
    public JtalksPermission getBranchPermissionByMask(int mask) {
        return QuestionPluginBranchPermission.findByMask(mask);
=======
    public UiElementDto getCreateTopicBtnDto(long branchId) {
        return new UiElementDto("new-question-btn", "label.addQuestion", "label.addQuestion.tip", "/questions/new?branchId=" + branchId);
>>>>>>> 4bfeca2a313a6fc98020e5dc71f2b3a4382799b4
    }

    /**
Solution content 
     * {@inheritDoc}
     */
    @Override
    public JtalksPermission getBranchPermissionByMask(int mask) {
        return QuestionsPluginBranchPermission.findByMask(mask);
    }

    /**
File
QuestionsAndAnswersPlugin.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
     * {@inheritDoc}
     */
    @Override
<<<<<<< HEAD
    public JtalksPermission getBranchPermissionByName(String name) {
        return QuestionPluginBranchPermission.valueOf(name);
=======
    public JtalksPermission getCreateTopicPermission() {
        return QuestionsPluginBranchPermission.CREATE_QUESTIONS;
>>>>>>> 4bfeca2a313a6fc98020e5dc71f2b3a4382799b4
    }
}
Solution content 
     * {@inheritDoc}
     */
    @Override
    public JtalksPermission getBranchPermissionByName(String name) {
        return QuestionsPluginBranchPermission.valueOf(name);
    }
}
File
QuestionsAndAnswersPlugin.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Return statement