Projects >> jcommune >>4f6857b7b424798962ea666bc71ffa93313c3a54

Chunk
Conflicting content 
 */
package org.jtalks.jcommune.service.transactional;

<<<<<<< HEAD

import java.io.BufferedReader;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;

import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
=======
>>>>>>> 3527e2e88720e9af79f64b8a6e2ca1a44659cbca
import org.jtalks.common.model.dao.ChildRepository;
import org.jtalks.jcommune.model.entity.Poll;
import org.jtalks.jcommune.model.entity.PollOption;
Solution content 
 */
package org.jtalks.jcommune.service.transactional;

import java.util.List;

import org.jtalks.common.model.dao.ChildRepository;
import org.jtalks.jcommune.model.entity.Poll;
import org.jtalks.jcommune.model.entity.PollOption;
File
TransactionalPollService.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.jtalks.jcommune.service.security.SecurityConstants;
import org.springframework.security.access.prepost.PreAuthorize;

<<<<<<< HEAD
=======
import java.util.List;

import static org.jtalks.jcommune.service.security.SecurityConstants.HAS_USER_OR_ADMIN_ROLE;

>>>>>>> 3527e2e88720e9af79f64b8a6e2ca1a44659cbca
/**
 * The implementation of the {@link PollService}.
 *
Solution content 
import org.jtalks.jcommune.service.security.SecurityConstants;
import org.jtalks.jcommune.service.security.TemporaryAuthorityManager;
import org.springframework.security.access.prepost.PreAuthorize;

/**
 * The implementation of the {@link PollService}.
 *
File
TransactionalPollService.java
Developer's decision
Version 1
Kind of conflict
Import