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