BUG-865: Remove ModificationType.MERGE

[yangtools.git] / yang / yang-data-api / src / main / java / org / opendaylight / yangtools / yang / data / api / schema / tree / ConflictingModificationAppliedException.java

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/ConflictingModificationAppliedException.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/ConflictingModificationAppliedException.java
index ee1ee8c8fa19f24396cb2a0387dc2fafb434c820..59610c28a3d557687a3fe9960f3d16918b593482 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/ConflictingModificationAppliedException.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/ConflictingModificationAppliedException.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.data.api.schema.tree;
 
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 /**
  * Exception thrown when a proposed change fails validation before being
@@ -22,11 +22,11 @@ public class ConflictingModificationAppliedException extends DataValidationFaile
      */
     private static final long serialVersionUID = 1L;
 
-    public ConflictingModificationAppliedException(final InstanceIdentifier path, final String message, final Throwable cause) {
+    public ConflictingModificationAppliedException(final YangInstanceIdentifier path, final String message, final Throwable cause) {
         super(path, message, cause);
     }
 
-    public ConflictingModificationAppliedException(final InstanceIdentifier path, final String message) {
+    public ConflictingModificationAppliedException(final YangInstanceIdentifier path, final String message) {
         super(path, message);
     }