Add collaboration feature
[sdc.git] / openecomp-be / lib / openecomp-conflict-lib / openecomp-conflict-api / src / main / java / org / openecomp / conflicts / types / Conflict.java
1 package org.openecomp.conflicts.types;
2
3 import org.openecomp.sdc.datatypes.model.ElementType;
4
5 public class Conflict<T> extends ConflictInfo {
6   private T yours;
7   private T theirs;
8
9   public Conflict(String id, ElementType type, String name) {
10     super(id, type, name);
11   }
12
13   public T getYours() {
14     return yours;
15   }
16
17   public void setYours(T yours) {
18     this.yours = yours;
19   }
20
21   public T getTheirs() {
22     return theirs;
23   }
24
25   public void setTheirs(T theirs) {
26     this.theirs = theirs;
27   }
28
29
30 }