From 69d8bf86863b370057e4ab3afbabb831f8668d8f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 8 Feb 2018 18:01:22 -0800 Subject: [PATCH] Fix merge conflict Closes gh-11969 --- eclipse/org.eclipse.jdt.core.prefs | 3 --- 1 file changed, 3 deletions(-) diff --git a/eclipse/org.eclipse.jdt.core.prefs b/eclipse/org.eclipse.jdt.core.prefs index 6bf7ed075a..fd34983312 100644 --- a/eclipse/org.eclipse.jdt.core.prefs +++ b/eclipse/org.eclipse.jdt.core.prefs @@ -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