Skip to content

Commit ce5f0ab

Browse files
committed
Merge branch 'master' into ST6RI-628
2 parents 6ffa6fb + 21ad318 commit ce5f0ab

12 files changed

Lines changed: 1213 additions & 1171 deletions

File tree

org.omg.kerml.xpect.tests/library/Occurrences.kerml

Lines changed: 463 additions & 394 deletions
Large diffs are not rendered by default.

org.omg.kerml.xpect.tests/library/Performances.kerml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ standard library package Performances {
184184
return : Anything[0..0];
185185
}
186186

187-
assoc Involves specializes BinaryLinkObject {
187+
assoc all Involves specializes BinaryLinkObject {
188188
doc
189189
/*
190190
* Involves asserts that the Behavior carried out by the involvingPerformance involves the
@@ -195,7 +195,7 @@ standard library package Performances {
195195
end feature involvedObject: Object[0..*] redefines target subsets involvingPerformance.involvedObjects;
196196
}
197197

198-
assoc Performs specializes Involves {
198+
assoc all Performs specializes Involves {
199199
doc
200200
/*
201201
* Performance asserts that the performer enacts the Behavior carried out by the performance.

0 commit comments

Comments
 (0)