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