diff options
author | 2019-05-12 22:27:13 -0400 | |
---|---|---|
committer | 2020-06-07 19:41:28 -0400 | |
commit | fcad3b0db48b45a7769c2934911f79307c103990 (patch) | |
tree | 5b8ef3721b291e8af82f24e7936457a9e8586a30 /Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java | |
parent | Pre-realisticBranchCreation Commit (diff) | |
download | VIATRA-Generator-fcad3b0db48b45a7769c2934911f79307c103990.tar.gz VIATRA-Generator-fcad3b0db48b45a7769c2934911f79307c103990.tar.zst VIATRA-Generator-fcad3b0db48b45a7769c2934911f79307c103990.zip |
Pre-realisticBranchCreation Commit
Diffstat (limited to 'Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java')
-rw-r--r-- | Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java index f938d5b3..5d7db7ba 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java | |||
@@ -1,3 +1,4 @@ | |||
1 | <<<<<<< HEAD:Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/yakindumm/Pseudostate.java | ||
1 | /** | 2 | /** |
2 | */ | 3 | */ |
3 | package ca.mcgill.ecse.dslreasoner.vampire.yakindumm; | 4 | package ca.mcgill.ecse.dslreasoner.vampire.yakindumm; |
@@ -15,3 +16,22 @@ package ca.mcgill.ecse.dslreasoner.vampire.yakindumm; | |||
15 | */ | 16 | */ |
16 | public interface Pseudostate extends Vertex { | 17 | public interface Pseudostate extends Vertex { |
17 | } // Pseudostate | 18 | } // Pseudostate |
19 | ======= | ||
20 | /** | ||
21 | */ | ||
22 | package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu; | ||
23 | |||
24 | |||
25 | /** | ||
26 | * <!-- begin-user-doc --> | ||
27 | * A representation of the model object '<em><b>Pseudostate</b></em>'. | ||
28 | * <!-- end-user-doc --> | ||
29 | * | ||
30 | * | ||
31 | * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage#getPseudostate() | ||
32 | * @model abstract="true" | ||
33 | * @generated | ||
34 | */ | ||
35 | public interface Pseudostate extends Vertex { | ||
36 | } // Pseudostate | ||
37 | >>>>>>> f1f2a1fa... Pre-realisticBranchCreation Commit:Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Pseudostate.java | ||