1 files changed, 17 insertions, 17 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictDto.java
index 004517434e..e7179fd6a3 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-types/src/main/java/org/openecomp/sdcrests/conflict/types/ConflictDto.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,28 +17,28 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.conflict.types;
 
 import java.util.Map;
 
 public class ConflictDto extends ConflictInfoDto {
-  private Map<String, Object> yours;
-  private Map<String, Object> theirs;
 
-  public Map<String, Object> getYours() {
-    return yours;
-  }
+    private Map<String, Object> yours;
+    private Map<String, Object> theirs;
+
+    public Map<String, Object> getYours() {
+        return yours;
+    }
 
-  public void setYours(Map<String, Object> yours) {
-    this.yours = yours;
-  }
+    public void setYours(Map<String, Object> yours) {
+        this.yours = yours;
+    }
 
-  public Map<String, Object> getTheirs() {
-    return theirs;
-  }
+    public Map<String, Object> getTheirs() {
+        return theirs;
+    }
 
-  public void setTheirs(Map<String, Object> theirs) {
-    this.theirs = theirs;
-  }
+    public void setTheirs(Map<String, Object> theirs) {
+        this.theirs = theirs;
+    }
 }