aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/Resolution.java
AgeCommit message (Expand)AuthorFilesLines
2021-03-24Reformat openecomp-bevasraz1-4/+3
2019-07-11Added oparent to sdc mainTomasz Golabek1-0/+20
2017-12-21Add collaboration featuretalig1-0/+5