Fix merge conflict

Closes gh-11969
pull/11971/head
Phillip Webb 7 years ago
parent d2418b99ef
commit 69d8bf8686

@ -105,10 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.source=1.8
<<<<<<< HEAD
=======
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
>>>>>>> local15x/1.5.x
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

Loading…
Cancel
Save