diff options
Diffstat (limited to 'org.jacoco.ant/src/org/jacoco/ant/MergeTask.java')
-rw-r--r-- | org.jacoco.ant/src/org/jacoco/ant/MergeTask.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/org.jacoco.ant/src/org/jacoco/ant/MergeTask.java b/org.jacoco.ant/src/org/jacoco/ant/MergeTask.java index de6897e4..373e96aa 100644 --- a/org.jacoco.ant/src/org/jacoco/ant/MergeTask.java +++ b/org.jacoco.ant/src/org/jacoco/ant/MergeTask.java @@ -1,13 +1,14 @@ /******************************************************************************* - * Copyright (c) 2009, 2019 Mountainminds GmbH & Co. KG and Contributors - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors + * This program and the accompanying materials are made available under + * the terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0 + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Brock Janiczak - initial API and implementation - * + * *******************************************************************************/ package org.jacoco.ant; @@ -37,7 +38,7 @@ public class MergeTask extends Task { /** * Sets the location of the merged data store - * + * * @param destfile * Destination data store location */ @@ -47,7 +48,7 @@ public class MergeTask extends Task { /** * This task accepts any number of execution data resources. - * + * * @param resources * Execution data resources */ |