Fixed a merge error
commit35ccefda406cb4a166474068719eda30bb68001f
authortero.turtiainen <devnull@localhost>
Sat, 19 Apr 2008 15:53:32 +0000 (19 18:53 +0300)
committertero.turtiainen <devnull@localhost>
Sat, 19 Apr 2008 15:53:32 +0000 (19 18:53 +0300)
treecba70f4df6d00c20bcef6186cc24eac19d3ede05
parent85f863807df9d2b2fa105b913b43fba2da695306
Fixed a merge error
widget/src/qt/nsNativeThemeQt.cpp