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