1 files changed, 22 insertions, 23 deletions
diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/Conflict.java b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/Conflict.java
index 80186f876b..33b2026628 100644
--- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/Conflict.java
+++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/Conflict.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,38 +17,37 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.conflicts.types;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.openecomp.sdc.datatypes.model.ElementType;
 
 public class Conflict<T> extends ConflictInfo {
-  private T yours;
-  private T theirs;
-
-  @VisibleForTesting
-  Conflict() {}
 
-  public Conflict(String id, ElementType type, String name) {
-    super(id, type, name);
-  }
+    private T yours;
+    private T theirs;
 
-  public T getYours() {
-    return yours;
-  }
+    @VisibleForTesting
+    Conflict() {
+    }
 
-  public void setYours(T yours) {
-    this.yours = yours;
-  }
+    public Conflict(String id, ElementType type, String name) {
+        super(id, type, name);
+    }
 
-  public T getTheirs() {
-    return theirs;
-  }
+    public T getYours() {
+        return yours;
+    }
 
-  public void setTheirs(T theirs) {
-    this.theirs = theirs;
-  }
+    public void setYours(T yours) {
+        this.yours = yours;
+    }
 
+    public T getTheirs() {
+        return theirs;
+    }
 
+    public void setTheirs(T theirs) {
+        this.theirs = theirs;
+    }
 }