ella
authored
main Conflicts: src/main/java/fr/cines/pacit/Pacit.java src/main/java/fr/cines/pacit/transfer/impl/HttpTransferImpl.java src/main/java/fr/cines/pacit/transfer/impl/SubmissionTask.java
main Conflicts: src/main/java/fr/cines/pacit/Pacit.java src/main/java/fr/cines/pacit/transfer/impl/HttpTransferImpl.java src/main/java/fr/cines/pacit/transfer/impl/SubmissionTask.java