| Chunk |
|---|
| Conflicting content |
|---|
import java.beans.IntrospectionException; import java.beans.Introspector; import java.beans.PropertyDescriptor; <<<<<<< HEAD import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; ======= >>>>>>> 950117449b4b8e8ca5e01f5b6168b9c8d813c993 import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Arrays; |
| Solution content |
|---|
import java.beans.IntrospectionException; import java.beans.Introspector; import java.beans.PropertyDescriptor; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Arrays; |
| File |
|---|
| MethodUtil.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |