diff options
Diffstat (limited to 'compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.uml')
| -rw-r--r-- | compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.uml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.uml new file mode 100644 index 00000000..b97b3d88 --- /dev/null +++ b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/noConflicts/commit1/model.uml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_qK6oQALfEeaaELR1VeNn7g" name="RootElement"> + <packagedElement xmi:type="uml:Package" xmi:id="_sapPMALfEeaaELR1VeNn7g" name="Wired"> + <packagedElement xmi:type="uml:Class" xmi:id="_3vm8UALfEeaaELR1VeNn7g" name="Rooter1"/> + <packagedElement xmi:type="uml:Class" xmi:id="_5lcckALfEeaaELR1VeNn7g" name="Switch1"/> + </packagedElement> + <packagedElement xmi:type="uml:Model" xmi:id="_tXD0IALfEeaaELR1VeNn7g" name="Wave"> + <packagedElement xmi:type="uml:Class" xmi:id="_7M0DAALfEeaaELR1VeNn7g" name="aerial1"/> + <packagedElement xmi:type="uml:Class" xmi:id="__lf6gALfEeaaELR1VeNn7g" name="relay1"/> + </packagedElement> +</uml:Model> |