clean merge conflict
[themes.git] / LCARStrek / global / commonDialog.css