diff options
Diffstat (limited to 'compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/package-info.java')
-rw-r--r-- | compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/package-info.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/package-info.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/package-info.java new file mode 100644 index 00000000..10a43636 --- /dev/null +++ b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/assocs/conflict/c1/package-info.java @@ -0,0 +1,18 @@ +/******************************************************************************* + * Copyright (c) 2015 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ + +/** + * This package contains test data about conflicts in association changes, where an existing association is + * reconnected in 2 branches. + * + * @author <a href="mailto:laurent.delaigue@obeo.fr">Laurent Delaigue</a> + */ +package org.eclipse.papyrus.compare.diagram.tests.merge.data.assocs.conflict.c1; |