Projects >> kotlin >>d9c833305c574a266cfc49299a849ff034d2d2a4

Chunk
Conflicting content 
            CompilerConfigurationKey.create("message collector");
    public static final CompilerConfigurationKey> COMPILER_PLUGINS =
            CompilerConfigurationKey.create("compiler plugins");
<<<<<<< HEAD
    public static final CompilerConfigurationKey REPORT_PERF =
            CompilerConfigurationKey.create("enable perf");
=======
    public static final CompilerConfigurationKey ALLOW_KOTLIN_PACKAGE =
            CompilerConfigurationKey.create("allow kotlin package");
>>>>>>> 3a1663febc8306be20684930d108b2c804447244

    private CLIConfigurationKeys() {
    }
Solution content 
            CompilerConfigurationKey.create("message collector");
    public static final CompilerConfigurationKey> COMPILER_PLUGINS =
            CompilerConfigurationKey.create("compiler plugins");
    public static final CompilerConfigurationKey ALLOW_KOTLIN_PACKAGE =
            CompilerConfigurationKey.create("allow kotlin package");

    private CLIConfigurationKeys() {
    }
File
CLIConfigurationKeys.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
            doMultipleBreakpointsTest(fileName);
        }

<<<<<<< HEAD
=======
        @TestMetadata("initializer.kt")
        public void testInitializer() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/initializer.kt");
            doMultipleBreakpointsTest(fileName);
        }

        @TestMetadata("isInsideInlineLambda.kt")
        public void testIsInsideInlineLambda() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/isInsideInlineLambda.kt");
            doMultipleBreakpointsTest(fileName);
        }

>>>>>>> 3a1663febc8306be20684930d108b2c804447244
        @TestMetadata("localFun.kt")
        public void testLocalFun() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/localFun.kt");
Solution content 
            doMultipleBreakpointsTest(fileName);
        }

        @TestMetadata("localFun.kt")
        public void testLocalFun() throws Exception {
            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/localFun.kt");
File
KotlinEvaluateExpressionTestGenerated.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration