[java-identity-provider] branch master updated: Remove git conflict markers mistakenly committed by someone

[Brent Putman]

This is an automated email from the git hooks/post-receive script.

putmanb pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=4d6895483ebac93a268efe57528059afbc0fbee8

The following commit(s) were added to refs/heads/master by this push:
       new  4d68954   Remove git conflict markers mistakenly committed by someone
4d68954 is described below

commit 4d6895483ebac93a268efe57528059afbc0fbee8
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Fri Mar 8 22:38:07 2019 -0500

    Remove git conflict markers mistakenly committed by someone
---
 idp-attribute-api/.settings/org.eclipse.jdt.core.prefs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/idp-attribute-api/.settings/org.eclipse.jdt.core.prefs b/idp-attribute-api/.settings/org.eclipse.jdt.core.prefs
index b20a886..6063eee 100644
--- a/idp-attribute-api/.settings/org.eclipse.jdt.core.prefs
+++ b/idp-attribute-api/.settings/org.eclipse.jdt.core.prefs
@@ -74,11 +74,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=disabled
-<<<<<<< HEAD
 org.eclipse.jdt.core.compiler.source=11
-=======
-org.eclipse.jdt.core.compiler.source=1.8
->>>>>>> Work in progress.
 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=16

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.