Added oparent to sdc main
[sdc.git] / openecomp-be / api / openecomp-sdc-rest-webapp / conflict-rest / conflict-rest-services / src / main / java / org / openecomp / sdcrests / conflict / rest / mapping / MapDtoToConflictResolution.java
2019-07-11 Tomasz GolabekAdded oparent to sdc main 65/91065/6
2017-12-21 taligAdd collaboration feature 29/26629/2