aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/main/java/org/openecomp/sdcrests/conflict/rest/mapping/MapDtoToConflictResolution.java
AgeCommit message (Expand)AuthorFilesLines
2021-03-24Reformat openecomp-bevasraz1-10/+8
2019-07-11Added oparent to sdc mainTomasz Golabek1-0/+20
2017-12-21Add collaboration featuretalig1-0/+15