Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoracuccuru2013-06-03 12:39:51 +0000
committeracuccuru2013-06-03 12:39:51 +0000
commitf23efd12c3b2397b3630cddc0dc9eaa58d4f9742 (patch)
treefd3e07a02b1eddd356ad81b4ecf8610622ac4c12 /extraplugins/uml
parent2fc4ecc070580dc2a9b85eba32479685e0892286 (diff)
downloadorg.eclipse.papyrus-f23efd12c3b2397b3630cddc0dc9eaa58d4f9742.tar.gz
org.eclipse.papyrus-f23efd12c3b2397b3630cddc0dc9eaa58d4f9742.tar.xz
org.eclipse.papyrus-f23efd12c3b2397b3630cddc0dc9eaa58d4f9742.zip
Removed CEA copyright from the merger class (for the moment, this code is just a copy / paste from an Obeo contribution)
Diffstat (limited to 'extraplugins/uml')
-rw-r--r--extraplugins/uml/compare2/org.eclipse.papyrus.compare/src/merge/PapyrusMerger.java14
1 files changed, 0 insertions, 14 deletions
diff --git a/extraplugins/uml/compare2/org.eclipse.papyrus.compare/src/merge/PapyrusMerger.java b/extraplugins/uml/compare2/org.eclipse.papyrus.compare/src/merge/PapyrusMerger.java
index 9447a0f78a8..20b622bd899 100644
--- a/extraplugins/uml/compare2/org.eclipse.papyrus.compare/src/merge/PapyrusMerger.java
+++ b/extraplugins/uml/compare2/org.eclipse.papyrus.compare/src/merge/PapyrusMerger.java
@@ -1,17 +1,3 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * 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:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
package merge;
import org.eclipse.emf.common.util.Monitor;

Back to the top