# Conflicts: # spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java # src/eclipse/org.eclipse.jdt.ui.prefs
# Conflicts: # spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java # src/eclipse/org.eclipse.jdt.ui.prefs