Projects >> gradle >>2a774ab52323872b745cf53b1ca4351c44c4b8bf

Chunk
Conflicting content 
import org.gradle.jvm.JvmBinarySpec;
import org.gradle.jvm.JvmByteCode;
import org.gradle.jvm.internal.DependencyResolvingClasspath;
<<<<<<< HEAD
import org.gradle.jvm.internal.JarBinarySpecInternal;
import org.gradle.jvm.tasks.Jar;
=======
>>>>>>> 41a295005e61d2af95cbd8a6328f60a3352d951e
import org.gradle.language.base.LanguageSourceSet;
import org.gradle.language.base.DependentSourceSet;
import org.gradle.language.base.internal.SourceTransformTaskConfig;
Solution content 
import org.gradle.jvm.JvmBinarySpec;
import org.gradle.jvm.JvmByteCode;
import org.gradle.jvm.internal.DependencyResolvingClasspath;
import org.gradle.jvm.internal.JarBinarySpecInternal;
import org.gradle.language.base.LanguageSourceSet;
import org.gradle.language.base.DependentSourceSet;
import org.gradle.language.base.internal.SourceTransformTaskConfig;
File
JavaLanguagePlugin.java
Developer's decision
Combination
Kind of conflict
Import