Fix merge conflict
authorMatthias Schmidt <gravatronics@live.com>
Sun, 6 Dec 2020 14:11:50 +0000 (15:11 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 6 Dec 2020 14:11:50 +0000 (15:11 +0100)
commitf247e6f10c02b18a9d32c9d6064c36eb2867d37c
tree29e7ab0ff46655d16ad5d29e787314d7f47d4c13
parent21711a621df39851ca1d7eb6e883c1e135061ecd
Fix merge conflict
wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Select.js
wcfsetup/install/files/ts/WoltLabSuite/Core/Media/Manager/Select.js