bug 396315. get type1 fonts fonts mostly displaying correctly. (also fixes bug 410801. use postscript opentype fonts for fallback) r=vlad

gfx/thebes/public/gfxWindowsFonts.h

@@ -192,11 +192,8 @@ public:
 
     PRPackedBool mUnicodeFont;
     PRPackedBool mSymbolFont;
-<<<<<<< gfxWindowsFonts.h
     PRPackedBool mIsType1;
-=======
     PRPackedBool mIsBadUnderlineFont;
->>>>>>> 1.68
 
     std::bitset<256> mCharset;
     std::bitset<128> mUnicodeRanges;