Miriam Baglioni 8f6ce970f9 moved PacePerson to dhp-common to avoid conflict in dependency with graph-mapper		2020-05-25 10:25:55 +02:00
..
collector/worker/model	resolved conflicts	2020-04-29 11:41:31 +02:00
data/mdstore/manager/common/model	resolved conflicts	2020-04-29 11:41:31 +02:00
dhp	moved PacePerson to dhp-common to avoid conflict in dependency with graph-mapper	2020-05-25 10:25:55 +02:00
message	cleanup	2020-04-29 19:09:07 +02:00
scholexplorer/relation	resolved conflicts	2020-04-29 11:41:31 +02:00