fix merge conflict

TheIceEagle · Mar 1, 2022 · 53f7cae · 53f7cae
1 parent 94fb956
commit 53f7cae
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/data/part-1/6-conditional-statements.md b/data/part-1/6-conditional-statements.md
@@ -1526,16 +1526,16 @@ if (number % 4 != 0) {
 
 When a gift is given by a close relative or a family member, the amount of gift tax is determined by the following table (source [vero.fi](https://www.vero.fi/en/individuals/property/gifts/gift-tax-calculator/#gifttaxtables)):
 
-| Value of gift        | Tax at the lower limit | Tax rate(%) for exceeding part |
-| -------------------- | ---------------------- | ------------------------------ |
-| 5 000 -- 25 000      | 100                    | 8                              |
-| 25 000 -- 55 000     |  1 700                 | 10                             |
-| 55 000 -- 200 000    | 4 700                  | 12                             |
-| 200 000 -- 1 000 000 | 22 100                 | 15                             |
-| 1 000 000 --         | 142 100                | 17                             |
+| Value of gift        | Tax at the lower limit    | Tax rate(%) for exceeding part  |
+| -------------------- | ----------------------    | ------------------------------  |
+| 5 000 -- 25 000      | 100                       | 8                               |
+| 25 000 -- 55 000     | 1 700                     | 10                              |
+| 55 000 -- 200 000    | 4 700                     | 12                              |
+| 200 000 -- 1 000 000 | 22 100                    | 15                              |
+| 1 000 000 --         | 142 100                   | 17                              |
 
 <!-- Esimerkiksi 6000 euron lahjasta tulee maksaa veroa 180 euroa (100 + (6000-5000) * 0.08), ja 75000 euron lahjasta tulee maksaa veroa 7100 euroa (4700 + (75000-55000) * 0.12). -->
-
+<!-- The formula used to calculate the gift tax is: (Tax at the lower limit + (Value of gift (€) - minimum value of gift (€)) * (Tax Rate (%) / 100) -->
 For example 6000€ gift implies 180€ of gift tax (100 + (6000-5000) * 0.08), and 75000€ gift implies 7100€ of gift tax (4700 + (75000-55000) * 0.12).
 
 <!-- Tee ohjelma, joka laskee lahjaveron lähimmiltä sukulaisilta annetulle lahjalle. Alla on muutama esimerkki ohjelman toiminnasta. -->