Fix bad merge
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 27 Jan 2021 16:28:25 +0000 (17:28 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 27 Jan 2021 16:28:25 +0000 (17:28 +0100)
commit6a945cb2ad4c1806dd9a2c394c427a2d926b2eae
treed882d99a76662a6f800aaaab7ac4bbf7da867430
parent521f18fb9505d68091945d6ee484277dac89645c
Fix bad merge

see 521f18fb9505d68091945d6ee484277dac89645c
see fa8aae2ad5f9299fdbce5feed23fe03a4fb335d4
wcfsetup/install/files/lib/form/ArticleAddForm.class.php