Projects >> greenhouse >>54eaaa1599618d914e412a413555758c855a4eda

Chunk
Conflicting content
import org.slf4j.LoggerFactory;
import org.springframework.security.oauth.consumer.OAuthConsumerSupport;
import org.springframework.security.oauth.consumer.token.OAuthConsumerToken;
<<<<<<< HEAD
import org.springframework.stereotype.Service;

@Service
=======
import org.springframework.stereotype.Component;

@Component
>>>>>>> dec27464f0e346d56d0328b55ea651a8900f30f4
public class TwitterService {
	
    Logger logger = LoggerFactory.getLogger(getClass());
Solution content
import org.slf4j.LoggerFactory;
import org.springframework.security.oauth.consumer.OAuthConsumerSupport;
import org.springframework.security.oauth.consumer.token.OAuthConsumerToken;
import org.springframework.stereotype.Component;

@Component
public class TwitterService {
	
    Logger logger = LoggerFactory.getLogger(getClass());
File
TwitterService.java
Developer's decision
Version 2
Kind of conflict
Annotation
Import