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