clean merge conflict
[themes.git] / LCARStrek / mozapps / update / update.png
CommitLineData
e10e7add
RK
1