diff options
Diffstat (limited to 'compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/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/conflicts/test2/commit1/model.uml | 18 |
1 files changed, 18 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/conflicts/test2/commit1/model.uml b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.uml new file mode 100644 index 00000000..e3c8081f --- /dev/null +++ b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/merge/data/additive/conflicts/test2/commit1/model.uml @@ -0,0 +1,18 @@ +<?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="_fXBloAYFEea42MxsVYThfw" name="RootElement"> + <packagedElement xmi:type="uml:Package" xmi:id="_3FXDMAYFEea42MxsVYThfw" name="wired"> + <packagedElement xmi:type="uml:Class" xmi:id="__i-IsAYFEea42MxsVYThfw" name="Rooter1"/> + <packagedElement xmi:type="uml:Class" xmi:id="_A-kkAAYGEea42MxsVYThfw" name="Rooter2"/> + <packagedElement xmi:type="uml:Realization" xmi:id="_E7sg4AYGEea42MxsVYThfw" client="_3FXDMAYFEea42MxsVYThfw" supplier="_9oMeEAYFEea42MxsVYThfw"/> + <packagedElement xmi:type="uml:Realization" xmi:id="_Gq84AAYGEea42MxsVYThfw" client="_A-kkAAYGEea42MxsVYThfw" supplier="_9oMeEAYFEea42MxsVYThfw"/> + <packagedElement xmi:type="uml:Class" xmi:id="_RXeFEAYGEea42MxsVYThfw" name="Switch"/> + </packagedElement> + <packagedElement xmi:type="uml:Package" xmi:id="_4HfOkAYFEea42MxsVYThfw" name="wave"> + <packagedElement xmi:type="uml:Class" xmi:id="_CFz44AYGEea42MxsVYThfw" name="WifiRooter"/> + <packagedElement xmi:type="uml:Realization" xmi:id="_KQjswAYGEea42MxsVYThfw" client="_CFz44AYGEea42MxsVYThfw" supplier="_9oMeEAYFEea42MxsVYThfw"/> + <packagedElement xmi:type="uml:Class" xmi:id="_VjuqIAYGEea42MxsVYThfw" name="Antenna"/> + </packagedElement> + <packagedElement xmi:type="uml:Package" xmi:id="_5DTWkAYFEea42MxsVYThfw" name="commons"> + <packagedElement xmi:type="uml:Interface" xmi:id="_9oMeEAYFEea42MxsVYThfw" name="Rooter"/> + </packagedElement> +</uml:Model> |