Revert "merge"

This reverts commit 72c37e6f.

de.fhmuenster.masterthesis.textgeneratordsl.ide/src-gen/de/fhmuenster/masterthesis/ide/contentassist/antlr/internal/InternalTestgeneratorDSL.tokens

 '!='=19
 '<'=20
 '<='=22
-<<<<<<< Updated upstream
 '='=76
 '=='=18
 '>'=21
@@ -68,70 +67,6 @@
 'variables'=74
 'with'=28
 'without'=70
-=======
-'='=72
-'=='=18
-'>'=21
-'>='=23
-'BPMNDiagram'=24
-'Boolean'=54
-'BusinessRuleTask'=43
-'DelegateMock'=75
-'EndEvent'=34
-'ExternalServiceMock'=73
-'ExternalTopic'=50
-'Flow'=63
-'FlowElement'=31
-'Gateway'=47
-'Integer'=53
-'Loop'=55
-'ManualTask'=36
-'ScriptTask'=37
-'SequenceFlow'=48
-'ServiceTask'=38
-'StartEvent'=32
-'String'=51
-'Test'=67
-'UserTask'=35
-'and'=45
-'bpmn'=27
-'by'=58
-'check'=71
-'complexity'=61
-'delegate'=39
-'dmn'=29
-'elements'=65
-'embedded'=30
-'ends'=59
-'expression'=49
-'external'=40
-'false'=17
-'follows'=57
-'for'=64
-'hardcoded'=41
-'has'=60
-'if'=77
-'inputVariables'=33
-'inputs'=42
-'key'=28
-'label'=46
-'manual'=79
-'mocks'=69
-'passed'=62
-'priority'=68
-'proposals'=52
-'resultVariable'=44
-'rule'=76
-'set'=78
-'setter'=80
-'starts'=56
-'testpackage'=26
-'topic'=74
-'true'=16
-'variables'=70
-'with'=25
-'without'=66
->>>>>>> Stashed changes
 RULE_ANY_OTHER=15
 RULE_ASSOCIATION=5
 RULE_DECLARATION_FINISHED=4
@@ -209,10 +144,7 @@ T__77=77
 T__78=78
 T__79=79
 T__80=80
-<<<<<<< Updated upstream
 T__81=81
 T__82=82
 T__83=83
 T__84=84
-=======
->>>>>>> Stashed changes

de.fhmuenster.masterthesis.textgeneratordsl/src-gen/de/fhmuenster/masterthesis/parser/antlr/internal/InternalTestgeneratorDSL.tokens

-<<<<<<< Updated upstream
 '!='=67
 '<'=78
 '<='=80
@@ -16,24 +15,6 @@
 'Flow'=55
 'FlowElement'=23
 'GREEN'=82
-=======
-'!='=66
-'<'=77
-'<='=79
-'='=64
-'=='=65
-'>'=78
-'>='=80
-'BPMNDiagram'=16
-'Boolean'=46
-'BusinessRuleTask'=35
-'DelegateMock'=69
-'EndEvent'=26
-'ExternalServiceMock'=67
-'ExternalTopic'=42
-'Flow'=55
-'FlowElement'=23
->>>>>>> Stashed changes
 'Gateway'=39
 'Integer'=45
 'Loop'=47
@@ -44,7 +25,6 @@
 'ServiceTask'=30
 'StartEvent'=24
 'String'=43
-<<<<<<< Updated upstream
 'Test'=60
 'UserTask'=27
 'YELLOW'=83
@@ -56,42 +36,21 @@
 'delegate'=31
 'dmn'=21
 'elements'=58
-=======
-'Test'=59
-'UserTask'=27
-'and'=37
-'bpmn'=19
-'by'=50
-'check'=63
-'complexity'=53
-'delegate'=31
-'dmn'=21
-'elements'=57
->>>>>>> Stashed changes
 'embedded'=22
 'ends'=51
 'expression'=41
 'external'=32
-<<<<<<< Updated upstream
 'false'=77
 'flag'=57
-=======
-'false'=76
->>>>>>> Stashed changes
 'follows'=49
 'for'=56
 'hardcoded'=33
 'has'=52
-<<<<<<< Updated upstream
 'if'=72
-=======
-'if'=71
->>>>>>> Stashed changes
 'inputVariables'=25
 'inputs'=34
 'key'=20
 'label'=38
-<<<<<<< Updated upstream
 'manual'=74
 'mocks'=62
 'passed'=54
@@ -108,24 +67,6 @@
 'variables'=63
 'with'=17
 'without'=59
-=======
-'manual'=73
-'mocks'=61
-'passed'=54
-'priority'=60
-'proposals'=44
-'resultVariable'=36
-'rule'=70
-'set'=72
-'setter'=74
-'starts'=48
-'testpackage'=18
-'topic'=68
-'true'=75
-'variables'=62
-'with'=17
-'without'=58
->>>>>>> Stashed changes
 RULE_ANY_OTHER=15
 RULE_ASSOCIATION=6
 RULE_DECLARATION_FINISHED=10
@@ -203,10 +144,7 @@ T__77=77
 T__78=78
 T__79=79
 T__80=80
-<<<<<<< Updated upstream
 T__81=81
 T__82=82
 T__83=83
 T__84=84
-=======
->>>>>>> Stashed changes