Fix bogus merge
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 16 Jul 2019 16:57:00 +0000 (18:57 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 16 Jul 2019 16:57:23 +0000 (18:57 +0200)
commit4ad081589a2948669ea78042a167bf99aefb2e6c
tree859e9c24be5474bef522a648ac227a298ddc8869
parent6a7fa369bde8d5a1033e147e0bd3a00b17e3c401
Fix bogus merge

see d63bdce228d569a44ad20d2a00b6b0ba6267ae92
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml