Projects >> kotlin >>921085ae6fe43379322cf5d3852dcbe6c73ce4cb

Chunk
Conflicting content 
package org.jetbrains.jet.cli;

<<<<<<< HEAD
import com.google.common.collect.Lists;
=======
import com.google.common.collect.*;
import com.intellij.core.JavaCoreEnvironment;
>>>>>>> 000086555b4c334bbe1fc46d30002b0ac9c60420
import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
Solution content 
package org.jetbrains.jet.cli;

import com.google.common.collect.*;
import com.intellij.core.JavaCoreEnvironment;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
File
KotlinCompiler.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
<<<<<<< HEAD
import org.jetbrains.jet.JetCoreEnvironment;
=======
import com.sampullara.cli.Args;
import com.sampullara.cli.Argument;
>>>>>>> 000086555b4c334bbe1fc46d30002b0ac9c60420
import org.jetbrains.jet.codegen.ClassFileFactory;
import org.jetbrains.jet.codegen.GenerationState;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
Solution content 
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.sampullara.cli.Args;
import com.sampullara.cli.Argument;
import org.jetbrains.jet.codegen.ClassFileFactory;
import org.jetbrains.jet.codegen.GenerationState;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
File
KotlinCompiler.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.jetbrains.jet.codegen.GenerationState;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
<<<<<<< HEAD
=======
import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
import org.jetbrains.jet.lang.diagnostics.DiagnosticWithTextRange;
import org.jetbrains.jet.lang.diagnostics.Severity;
import org.jetbrains.jet.lang.parsing.JetParserDefinition;
>>>>>>> 000086555b4c334bbe1fc46d30002b0ac9c60420
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetNamespace;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
Solution content 
import org.jetbrains.jet.codegen.GenerationState;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
import org.jetbrains.jet.lang.diagnostics.DiagnosticWithTextRange;
import org.jetbrains.jet.lang.diagnostics.Severity;
import org.jetbrains.jet.lang.parsing.JetParserDefinition;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetNamespace;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
File
KotlinCompiler.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
        if (rtJar == null || !rtJar.exists()) {
            System.out.print("No rt.jar found under JAVA_HOME=" + javaHome);
<<<<<<< HEAD
            return;
        }

        environment.addToClasspath(rtJar);

        VirtualFile vFile = environment.getLocalFileSystem().findFileByPath(args [0]);
        if (vFile == null) {
            System.out.print("File not found: " + args[0]);
            return;
=======
            return null;
>>>>>>> 000086555b4c334bbe1fc46d30002b0ac9c60420
        }
        return rtJar;
    }
Solution content 
        if (rtJar == null || !rtJar.exists()) {
            System.out.print("No rt.jar found under JAVA_HOME=" + javaHome);
            return null;
        }
        return rtJar;
    }
File
KotlinCompiler.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Return statement
Variable