Miriam Baglioni f7695e833c resolved conflicts		2020-04-29 11:41:31 +02:00
..
java/eu/dnetlib/maven/plugin/properties	resolved conflicts	2020-04-29 11:41:31 +02:00
resources/eu/dnetlib/maven/plugin/properties	integrating the oozie workflow build/deploy/run mechanism, took inspiration from iis	2019-10-17 18:38:30 +02:00