root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Fix merge conflict 

Closes gh-11969
This commit is contained in:
Phillip Webb 2018-02-08 18:01:22 -08:00
parent d2418b99ef
commit 69d8bf8686
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eclipse/org.eclipse.jdt.core.prefs
View File

@ -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