NXP-29984: remove useless compatWarnOnMerge markers (only one propert…

…y to define anyway)
nuxeo · Feb 16, 2021 · 4709cfd · 4709cfd
1 parent 6971143
commit 4709cfd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...uxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/download/RedirectResolverDescriptor.java b/...uxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/download/RedirectResolverDescriptor.java
@@ -28,7 +28,7 @@
  * @author Remi Cattiau
  */
 @XObject("redirectResolver")
-@XRegistry(compatWarnOnMerge = true)
+@XRegistry
 public class RedirectResolverDescriptor {
 
     @XNode("@class")

diff --git a/...tomation-io/src/main/java/org/nuxeo/ecm/automation/io/services/codec/CodecDescriptor.java b/...tomation-io/src/main/java/org/nuxeo/ecm/automation/io/services/codec/CodecDescriptor.java
@@ -27,7 +27,7 @@
  * @author <a href="mailto:bs@nuxeo.com">Bogdan Stefanescu</a>
  */
 @XObject("codec")
-@XRegistry(compatWarnOnMerge = true)
+@XRegistry
 public class CodecDescriptor {
 
     @XNode("@class")