Sandro La Bruzzo c73072079d fix conflicts		2021-03-22 16:36:31 +01:00
..
DLIDataset.java	reformatted code according to the updated style descriptor	2020-04-28 11:23:29 +02:00
DLIPublication.java	reformatted code according to the updated style descriptor	2020-04-28 11:23:29 +02:00
DLIUnknown.java	updated mergeFrom function for DLI Unknown	2020-08-10 10:18:35 +02:00
OafUtils.scala	fix conflicts	2021-03-22 16:36:31 +01:00
ProvenaceInfo.java	switched automatic code formatting plugin to net.revelc.code.formatter:formatter-maven-plugin	2020-04-27 14:52:31 +02:00