Enrico Ottonello 3510d7d1be Merge branch 'new_es_mapping' ... # Conflicts: # dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/read_collection_data_template.sparql # dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/read_record_data_template.sparql # dnet-ariadneplus-graphdb-publisher/test/java/eu/dnetlib/ariadneplus/GraphDbReaderAndESIndexTest.java		2021-09-08 15:56:12 +02:00
..
java/eu/dnetlib/ariadneplus	Merge branch 'new_es_mapping'	2021-09-08 15:56:12 +02:00
resources	Merge branch 'new_es_mapping'	2021-09-08 15:56:12 +02:00