Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/package-info.java')
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/package-info.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/package-info.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/package-info.java
index 0dfb6114a..f34e8de49 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/package-info.java
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/package-info.java
@@ -10,8 +10,9 @@
*******************************************************************************/
/**
- * This package contains test data about conflicts in association changes,
- * where an existing association is reconnected in 2 branches.
+ * 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.emf.compare.diagram.papyrus.tests.merge.data.assocs.conflict.c1; \ No newline at end of file
+package org.eclipse.emf.compare.diagram.papyrus.tests.merge.data.assocs.conflict.c1;

Back to the top