1 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeStatus.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeStatus.java
index 29a475b5a..434dcebdf 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeStatus.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeStatus.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
  * 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
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
@@ -69,4 +69,4 @@ public interface IMergeStatus extends IStatus {
 	 */
 	public abstract IFile[] getConflictingFiles();
 
-}
-\ No newline at end of file
+}