Sandro La Bruzzo 843dc95340 resolved conflict		2024-04-11 17:38:16 +02:00
..
java/eu/dnetlib/dhp	Merge pull request 'Add action set creation for Datacite affiliations' (#413) from 9647_datacite_affiliations into beta	2024-04-02 17:33:38 +02:00
resources/eu/dnetlib/dhp	resolved conflict	2024-04-11 17:38:16 +02:00
scala/eu/dnetlib/dhp	mapping generated for MAG,	2024-04-05 18:12:53 +02:00