Projects >> sonar-objective-c >>a1e94950696d8ca2430d435be2221196a7089ec0

Chunk
Conflicting content 
import com.google.common.collect.ImmutableList;

@Properties({
<<<<<<< HEAD
        @Property(key = OCLintSensor.REPORT_PATH_KEY, defaultValue = OCLintSensor.DEFAULT_REPORT_PATH, name = "Path to oclint pmd formatted report", description = "Relative to projects' root.", global = false, project = true), })
=======
	@Property(key = ObjectiveCCoverageSensor.REPORT_PATTERN_KEY, defaultValue = ObjectiveCCoverageSensor.DEFAULT_REPORT_PATTERN, name = "Path to unit test coverage report(s)", description = "Relative to projects' root. Ant patterns are accepted", global = false, project = true), })
>>>>>>> 99788e6a37091e542f7233fa10ba465474743207
public class ObjectiveCPlugin extends SonarPlugin {

    public List> getExtensions() {
Solution content 
import com.google.common.collect.ImmutableList;

@Properties({
        @Property(key = OCLintSensor.REPORT_PATH_KEY, defaultValue = OCLintSensor.DEFAULT_REPORT_PATH, name = "Path to oclint pmd formatted report", description = "Relative to projects' root.", global = false, project = true), })
public class ObjectiveCPlugin extends SonarPlugin {

    public List> getExtensions() {
File
ObjectiveCPlugin.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
                ObjectiveCSourceImporter.class,
                ObjectiveCColorizerFormat.class, ObjectiveCCpdMapping.class,

<<<<<<< HEAD
                ObjectiveCSquidSensor.class, ObjectiveCProfile.class,
                OCLintRuleRepository.class,
                OCLintSensor.class, OCLintProfile.class,
                OCLintProfileImporter.class
        // ObjectiveCRuleRepository.class,
        // ObjectiveCProfile.class,
        //
        // OCTestDriverSurefireSensor.class,
        // OCTestDriverCoverageSensor.class,
        //
        // OCTestMavenInitializer.class,
        // OCTestMavenPluginHandler.class,
        // OCTestCoverageSensor.class,
        // OCTestSurefireSensor.class
=======
                ObjectiveCSquidSensor.class,
                ObjectiveCProfile.class,
                ObjectiveCCoverageSensor.class
//                ObjectiveCRuleRepository.class,
//                ObjectiveCProfile.class,
//
//                OCTestDriverSurefireSensor.class,
//                OCTestDriverCoverageSensor.class,
//
//                OCTestMavenInitializer.class,
//                OCTestMavenPluginHandler.class,
//                OCTestCoverageSensor.class,
//                OCTestSurefireSensor.class
>>>>>>> 99788e6a37091e542f7233fa10ba465474743207
                );
    }
Solution content 
                ObjectiveCSourceImporter.class,
                ObjectiveCColorizerFormat.class, ObjectiveCCpdMapping.class,

                ObjectiveCSquidSensor.class, ObjectiveCProfile.class,
                OCLintRuleRepository.class,
                OCLintSensor.class, OCLintProfile.class,
                OCLintProfileImporter.class
        // ObjectiveCRuleRepository.class,
        // ObjectiveCProfile.class,
        //
        // OCTestDriverSurefireSensor.class,
        // OCTestDriverCoverageSensor.class,
        //
        // OCTestMavenInitializer.class,
        // OCTestMavenPluginHandler.class,
        // OCTestCoverageSensor.class,
        // OCTestSurefireSensor.class
                );
    }
File
ObjectiveCPlugin.java
Developer's decision
Version 1
Kind of conflict
Comment