clean merge conflict
[themes.git] / LCARStrek / navigator / icons / reload-hover.gif
LCARStrek/navigator/icons/reload-hover.gif