Remove stray merge conflict marking, add two additional empty translations to match template.txt

This commit is contained in:
teknomunk 2024-08-18 19:59:05 -05:00
parent 316d5bf197
commit 88be86ab4b

@ -285,8 +285,9 @@ Slows down movement=Verlangsamt die Fortbewegung
Grows on sand or dirt next to water=Wächst auf Sand oder Erde neben Wasser
Stackable=Stapelbar
Needs soil and water to grow=Braucht Nährboden und Wasser zum wachsen
Crying Obsidian=
Crying obsidian is a luminous obsidian that can generate as part of ruined portals.=
Enchanted Golden Apple=Verzauberter goldener Apfel
Light=
Lights are invisible blocks. They are used to light up adventure maps and the like.=
When you hold a light in hand, you reveal all placed lights in a short distance around you.=
>>>>>>> 25a4fae2e (Last three German translations for #4529)