Projects >> resthub-spring-stack >>0c1590b1ca055bd9ff4dfd439ea671d2a8b06d21

Chunk
Conflicting content 
import org.resthub.common.service.CrudServiceImpl;
import org.resthub.web.model.Sample;
import org.resthub.web.repository.SampleResourceRepository;
<<<<<<< HEAD:resthub-web/resthub-web-server/src/test/java/org/resthub/web/service/impl/SampleResourceServiceImpl.java
import org.resthub.web.service.SampleResourceService;
import org.springframework.context.annotation.Profile;
=======
>>>>>>> 8b5bb7e28eddd6ad79a2128ff3d7b812e5b984c7:resthub-web/resthub-web-server/src/test/java/org/resthub/web/service/SampleResourceServiceImpl.java

@Named("webSampleResourceService")
public class SampleResourceServiceImpl extends CrudServiceImpl implements
Solution content 
import org.resthub.common.service.CrudServiceImpl;
import org.resthub.web.model.Sample;
import org.resthub.web.repository.SampleResourceRepository;

@Named("webSampleResourceService")
public class SampleResourceServiceImpl extends CrudServiceImpl implements
File
SampleResourceServiceImpl.java
Developer's decision
Version 2
Kind of conflict
Import