Projects >> lombok >>db71f39c271f1f8124fac96daa68d8b012fbf390

Chunk
Conflicting content 
import lombok.Lombok;
import lombok.core.AnnotationValues;
import lombok.core.AnnotationValues.AnnotationValueDecodeFail;
<<<<<<< HEAD
import lombok.core.configuration.ConfigurationKeysLoader;
=======
import lombok.core.BooleanFieldAugment;
>>>>>>> 17972d59fa7e2eec6b73ba5da8234f5fa7ac2536
import lombok.core.HandlerPriority;
import lombok.core.SpiLoadUtil;
import lombok.core.TypeLibrary;
Solution content 
import lombok.Lombok;
import lombok.core.AnnotationValues;
import lombok.core.AnnotationValues.AnnotationValueDecodeFail;
import lombok.core.configuration.ConfigurationKeysLoader;
import lombok.core.BooleanFieldAugment;
import lombok.core.HandlerPriority;
import lombok.core.SpiLoadUtil;
import lombok.core.TypeLibrary;
File
HandlerLibrary.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import lombok.core.AST.Kind;
import lombok.core.AnnotationValues;
import lombok.core.AnnotationValues.AnnotationValue;
<<<<<<< HEAD
=======
import lombok.core.BooleanFieldAugment;
import lombok.core.ReferenceFieldAugment;
import lombok.core.TransformationsUtil;
>>>>>>> 17972d59fa7e2eec6b73ba5da8234f5fa7ac2536
import lombok.core.TypeResolver;
import lombok.core.handlers.HandlerUtil;
import lombok.eclipse.EclipseAST;
Solution content 
import lombok.core.AST.Kind;
import lombok.core.AnnotationValues;
import lombok.core.AnnotationValues.AnnotationValue;
import lombok.core.BooleanFieldAugment;
import lombok.core.ReferenceFieldAugment;
import lombok.core.TypeResolver;
import lombok.core.handlers.HandlerUtil;
import lombok.eclipse.EclipseAST;
File
EclipseHandlerUtil.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import lombok.core.SpiLoadUtil;
import lombok.core.TypeLibrary;
import lombok.core.TypeResolver;
<<<<<<< HEAD
import lombok.core.AnnotationValues.AnnotationValueDecodeFail;
import lombok.core.configuration.ConfigurationKeysLoader;
=======
>>>>>>> 17972d59fa7e2eec6b73ba5da8234f5fa7ac2536
import lombok.javac.handlers.JavacHandlerUtil;

import com.sun.tools.javac.tree.JCTree;
Solution content 
import lombok.core.SpiLoadUtil;
import lombok.core.TypeLibrary;
import lombok.core.TypeResolver;
import lombok.core.configuration.ConfigurationKeysLoader;
import lombok.javac.handlers.JavacHandlerUtil;

import com.sun.tools.javac.tree.JCTree;
File
HandlerLibrary.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import lombok.core.AST.Kind;
import lombok.core.AnnotationValues;
import lombok.core.AnnotationValues.AnnotationValue;
<<<<<<< HEAD
import lombok.core.handlers.HandlerUtil;
=======
import lombok.core.ReferenceFieldAugment;
import lombok.core.TransformationsUtil;
>>>>>>> 17972d59fa7e2eec6b73ba5da8234f5fa7ac2536
import lombok.core.TypeResolver;
import lombok.delombok.LombokOptionsFactory;
import lombok.experimental.Accessors;
Solution content 
import lombok.core.AST.Kind;
import lombok.core.AnnotationValues;
import lombok.core.AnnotationValues.AnnotationValue;
import lombok.core.ReferenceFieldAugment;
import lombok.core.TypeResolver;
import lombok.core.handlers.HandlerUtil;
import lombok.delombok.LombokOptionsFactory;
import lombok.experimental.Accessors;
File
JavacHandlerUtil.java
Developer's decision
Manual
Kind of conflict
Import