clean merge conflict
[themes.git] / LCARStrek / navigator / icons / navigatoricons-small.png
LCARStrek/navigator/icons/navigatoricons-small.png