[java-identity-provider] branch main updated: Fix javadoc with masked git conflict markers.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-identity-provider.

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

The following commit(s) were added to refs/heads/main by this push:
     new a5ed141ac Fix javadoc with masked git conflict markers.
a5ed141ac is described below

commit a5ed141acf32388e92d3510c390924972817b8ef
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 16 21:49:56 2022 -0400

    Fix javadoc with masked git conflict markers.
---
 .../net/shibboleth/idp/profile/logic/DateAttributePredicate.java    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/DateAttributePredicate.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/DateAttributePredicate.java
index 7360c18c0..414c84ced 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/DateAttributePredicate.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/DateAttributePredicate.java
@@ -63,10 +63,7 @@ public class DateAttributePredicate extends AbstractAttributePredicate {
     private boolean resultIfMissing;
 
     /**
-     * Create a new instance that performs date comparisons against the given attribute
-<<<<<<< HEAD
-=======
-     * using ISO date/time format parser by default.
+     * Create a new instance that performs date comparisons against the given attribute.
      *
      * @param attribute Attribute name that provides candidate date values to test.
      */
@@ -78,7 +75,6 @@ public class DateAttributePredicate extends AbstractAttributePredicate {
 
     /**
      * Create a new instance that performs date comparisons against the given attribute
->>>>>>> 2f5e2a606 (IDP-1995 - Add support for DateTimeAttributeValue to supporting classes)
      * using the given date parser.
      *
      * @param attribute Attribute name that provides candidate date values to test.

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