clean merge conflict
[themes.git] / LCARStrek / mozapps / plugins / pluginGeneric.png
LCARStrek/mozapps/plugins/pluginGeneric.png