Add collaboration feature
[sdc.git] / openecomp-be / lib / openecomp-conflict-lib / openecomp-conflict-api / src / main / java / org / openecomp / conflicts / types / ConflictResolution.java
1 package org.openecomp.conflicts.types;
2
3 import java.util.Map;
4
5 public class ConflictResolution {
6   private Resolution resolution;
7   // sits in lower level...
8   private Map<String, Object> otherResolution;
9
10   public ConflictResolution() {
11   }
12
13   public ConflictResolution(Resolution resolution) {
14     this.resolution = resolution;
15   }
16
17   public Resolution getResolution() {
18     return resolution;
19   }
20
21   public void setResolution(Resolution resolution) {
22     this.resolution = resolution;
23   }
24
25   public Map<String, Object> getOtherResolution() {
26     return otherResolution;
27   }
28
29   public void setOtherResolution(Map<String, Object> otherResolution) {
30     this.otherResolution = otherResolution;
31   }
32 }