1 files changed, 23 insertions, 23 deletions
diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ConflictResolution.java b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ConflictResolution.java
index 04a790ca91..05387c6baf 100644
--- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ConflictResolution.java
+++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ConflictResolution.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,36 +17,36 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.conflicts.types;
 
 import java.util.Map;
 
 public class ConflictResolution {
-  private Resolution resolution;
-  // sits in lower level...
-  private Map<String, Object> otherResolution;
 
-  public ConflictResolution() {
-  }
+    private Resolution resolution;
+    // sits in lower level...
+    private Map<String, Object> otherResolution;
+
+    public ConflictResolution() {
+    }
 
-  public ConflictResolution(Resolution resolution) {
-    this.resolution = resolution;
-  }
+    public ConflictResolution(Resolution resolution) {
+        this.resolution = resolution;
+    }
 
-  public Resolution getResolution() {
-    return resolution;
-  }
+    public Resolution getResolution() {
+        return resolution;
+    }
 
-  public void setResolution(Resolution resolution) {
-    this.resolution = resolution;
-  }
+    public void setResolution(Resolution resolution) {
+        this.resolution = resolution;
+    }
 
-  public Map<String, Object> getOtherResolution() {
-    return otherResolution;
-  }
+    public Map<String, Object> getOtherResolution() {
+        return otherResolution;
+    }
 
-  public void setOtherResolution(Map<String, Object> otherResolution) {
-    this.otherResolution = otherResolution;
-  }
+    public void setOtherResolution(Map<String, Object> otherResolution) {
+        this.otherResolution = otherResolution;
+    }
 }