Projects information

Chunk

Conflicting content
final Logger logger = LoggerFactory.getLogger(TransactionalTopicService.class); ======= * @author Vervenko Pavel * @author Kirill Afonin */ <<<<<<< HEAD public class TransactionalTopicService extends AbstractTransactionlaEntityService implements TopicService { public class TransactionalTopicService extends AbstractTransactionalEntityService implements TopicService { >>>>>>> 6978759d415915905f194484f658ba411abd4393 private final SecurityService securityService; private TopicBranchService topicBranchService;

Conflicting content

    final Logger logger = LoggerFactory.getLogger(TransactionalTopicService.class);
=======
 * @author Vervenko Pavel
 * @author Kirill Afonin
 */
<<<<<<< HEAD
public class TransactionalTopicService extends AbstractTransactionlaEntityService implements TopicService {
public class TransactionalTopicService extends AbstractTransactionalEntityService implements TopicService {

>>>>>>> 6978759d415915905f194484f658ba411abd4393
    private final SecurityService securityService;
    private TopicBranchService topicBranchService;

Solution content
* @author Vervenko Pavel * @author Kirill Afonin */ public class TransactionalTopicService extends AbstractTransactionalEntityService implements TopicService { private final SecurityService securityService; private TopicBranchService topicBranchService;

Solution content

 * @author Vervenko Pavel
 * @author Kirill Afonin
 */
public class TransactionalTopicService extends AbstractTransactionalEntityService implements TopicService {

    private final SecurityService securityService;
    private TopicBranchService topicBranchService;

File
TransactionalTopicService.java

Developer's decision
Version 2

Kind of conflict
Attribute
Class signature
Method invocation

Projects >> jcommune >>2abbc3b8983060ba77acbc0d9a1a906d3e79fc05