Sandro La Bruzzo c73072079d fix conflicts		2021-03-22 16:36:31 +01:00
..
java/eu/dnetlib/dhp	fix conflicts	2021-03-22 16:36:31 +01:00
resources/eu/dnetlib/dhp	added instance.alternativeIdentifiers to the graph model, adjusted the mapping applied to the contents from the aggregator	2021-03-16 14:19:32 +01:00