Commit 3d76a3fe authored by Liana Soima's avatar Liana Soima

<Merge Conflict>

Solving merge conflict part 4.
Signed-off-by: Liana Soima's avatarLiana Soima <soima@fortiss.org>
Issue-Ref: 3732
parent 90ab7e12
ArgumentElementPropertySection.java 27a7c081845ffe5e688b0ba319f68aeef8ab3a88 GREEN
ArgumentModulePropertySection.java a96fcfeed6831cfe3cc145618b5ef7ea3ebf1d31 GREEN
ArgumentModuleQuantitativeProperty.java 9028829eec1c08c376f3b02d645b010b2c11a64c GREEN
AssumptionPropertySection.java 592f7fd7902f5875d7f426c44209eb55686d2e0f GREEN
AwayEntityPropertySection.java 5eb4e671ab554899cb5afdcdc873a2bbf034af69 GREEN
ConnectionPropertySection.java 4dedaca139ee71ce7ff7db0f0f21f53b12cc9f76 GREEN
AwayEntityPropertySection.java 04fc0a2bb021538eb905eb08f82929849abf4a3c YELLOW
ConnectionPropertySection.java 6101c574492d76c75a5062a6bb173626403cacd4 YELLOW
ContextPropertySection.java e6c4a8a1768c92d0a523a535975a8440fd8aff2e GREEN
GSNStatesPropertySection.java 265a362fea43d2d0c07dc19f039867f746fdbfbc YELLOW
GoalPropertySection.java 0772900f95497ec26085951264f8dc5c267408ac GREEN
OptionEntityPropertySection.java 783afb90532861c185a2e4ea5bd3c1b7e92483c2 GREEN
QuantitativeEvaluationPropertySection.java 3abfb63be471ff17ac97cc19078da83f99e48a41 GREEN
RequirementLinkPropertySection.java 7b7aa5574f9d4e1d13e33bf076f6bb0dba905b25 GREEN
\ No newline at end of file
OptionEntityPropertySection.java 783afb90532861c185a2e4ea5bd3c1b7e92483c2 YELLOW
RequirementLinkPropertySection.java 7b7aa5574f9d4e1d13e33bf076f6bb0dba905b25 GREEN
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment