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