Claudio Atzori 12e2f930c8 resolved conflicts		2020-12-10 10:57:39 +01:00
..
main/java/eu/dnetlib/dhp/schema	resolved conflicts	2020-12-10 10:57:39 +01:00
test/java/eu/dnetlib/dhp/schema	code formatting	2020-06-16 16:54:44 +02:00