Skip to content

S
spring-boot
Commit 69d8bf86 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Fix merge conflict 

Closes gh-11969
parent d2418b99
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
eclipse/org.eclipse.jdt.core.prefs
View file @ 69d8bf86
...@@ -105,10 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning ...@@ -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.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.source=1.8
<<<<<<< HEAD
=======
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 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.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_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment