diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/PseudoConflictMerger.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/PseudoConflictMerger.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/PseudoConflictMerger.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/PseudoConflictMerger.java index 2bc42cf9f..02db0b5dd 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/PseudoConflictMerger.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/PseudoConflictMerger.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* 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
@@ -14,7 +14,7 @@ import org.eclipse.emf.compare.ConflictKind; import org.eclipse.emf.compare.Diff;
/**
- * A simple merger for pseudo conflict. It only mark the differences as merged without doing anything except
+ * A simple merger for pseudo conflict. It only marks the differences as merged without doing anything except
* browsing the requirements and the equivalences.
*
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
|