diff options
| author |  20001LastOrder <boqi.chen@mail.mcgill.ca> | 2020-11-04 01:33:58 -0500 |
|---|---|---|
| committer | 20001LastOrder <boqi.chen@mail.mcgill.ca> | 2020-11-04 01:33:58 -0500 |
| commit | a20af4d0dbf5eab84ee271d426528aabb5a8ac3b (patch) | |
| tree | a9ab772ee313125aaf3a941d66e131b408d949ba /Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Foreign_Income.java | |
| parent | changes in settings of measurements (diff) | |
| parent | merge with current master, comment numerical solver related logging (diff) | |
| download | VIATRA-Generator-a20af4d0dbf5eab84ee271d426528aabb5a8ac3b.tar.gz VIATRA-Generator-a20af4d0dbf5eab84ee271d426528aabb5a8ac3b.tar.zst VIATRA-Generator-a20af4d0dbf5eab84ee271d426528aabb5a8ac3b.zip | |
fix merging issue
Diffstat (limited to 'Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Foreign_Income.java')
| -rw-r--r-- | Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Foreign_Income.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Foreign_Income.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Foreign_Income.java new file mode 100644 index 00000000..023b28d9 --- /dev/null +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Foreign_Income.java | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | /** | ||
| 2 | */ | ||
| 3 | package Taxation; | ||
| 4 | |||
| 5 | |||
| 6 | /** | ||
| 7 | * <!-- begin-user-doc --> | ||
| 8 | * A representation of the model object '<em><b>Foreign Income</b></em>'. | ||
| 9 | * <!-- end-user-doc --> | ||
| 10 | * | ||
| 11 | * | ||
| 12 | * @see Taxation.TaxationPackage#getForeign_Income() | ||
| 13 | * @model | ||
| 14 | * @generated | ||
| 15 | */ | ||
| 16 | public interface Foreign_Income extends Income { | ||
| 17 | } // Foreign_Income | ||