Skip to content

Commit

Permalink
Merge branch 'index-links/right' into index-links/left
Browse files Browse the repository at this point in the history
Conflicts:
	fragments/SA.airdfragment
  • Loading branch information
martinlehmann committed Sep 27, 2023
2 parents 149ce5d + 7085358 commit d3bd76a
Show file tree
Hide file tree
Showing 3 changed files with 405 additions and 377 deletions.
5 changes: 4 additions & 1 deletion fragments/OA.capellafragment
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
<ownedFunctionPkg xsi:type="org.polarsys.capella.core.data.oa:OperationalActivityPkg"
id="e6920b5b-e863-42a8-a205-86069c8d35af" name="Operational Activities">
<ownedOperationalActivities xsi:type="org.polarsys.capella.core.data.oa:OperationalActivity"
id="d90e3f89-2407-417a-b01f-2114b32ff329" name="Root Operational Activity"/>
id="d90e3f89-2407-417a-b01f-2114b32ff329" name="Root Operational Activity">
<ownedFunctions xsi:type="org.polarsys.capella.core.data.oa:OperationalActivity"
id="0f0f97ea-d252-4211-9923-f0acbbd73d66" name="make delicious drinks"/>
</ownedOperationalActivities>
</ownedFunctionPkg>
<ownedAbstractCapabilityPkg xsi:type="org.polarsys.capella.core.data.oa:OperationalCapabilityPkg"
id="f12186d2-47a3-43d9-945f-df30da1e6b61" name="Operational Capabilities"/>
Expand Down
Loading

0 comments on commit d3bd76a

Please sign in to comment.