From ef35deb727190363d17d693d10f27171787cc92c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 3 Feb 2014 15:38:24 +0100
Subject: Solve some merge problems

---
 .../src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java')

diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
index 70695afdf..1a463591b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
+++ b/id/server/idserverlib/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
@@ -42,7 +42,7 @@ import javax.xml.bind.annotation.XmlType;
 })
 public class SignatureMethodType {
 
-    @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
     @XmlMixed
     @XmlAnyElement(lax = true)
     protected List<Object> content;
@@ -68,9 +68,9 @@ public class SignatureMethodType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
      * {@link String }
      * {@link Object }
-     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
      * 
      * 
      */
-- 
cgit v1.2.3