forked from D-Net/dnet-hadoop
Conflicts: dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/transformation/TransformationJobTest.java |
||
---|---|---|
.. | ||
java/eu/dnetlib/dhp | ||
resources/eu/dnetlib/dhp |
Conflicts: dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/transformation/TransformationJobTest.java |
||
---|---|---|
.. | ||
java/eu/dnetlib/dhp | ||
resources/eu/dnetlib/dhp |