Fixes merge conflict leftover (ryanoasis#61)

* attempt to not set stye in the 'fontname' attribute
LNKLEO · Mar 19, 2016 · d384c94 · d384c94
1 parent 707a070
commit d384c94
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/font-patcher b/font-patcher
@@ -100,7 +100,7 @@ fontname, fallbackStyle = re.match("^([^-]*).*?([^-]*(?!.*-))$", sourceFont.font
 familyname = fontname
 # fullname (filename) can always use long/verbose font name, even in windows
 fullname = sourceFont.fullname + verboseAdditionalFontNameSuffix
-fontname = fontname + additionalFontNameSuffix.replace(" ", "") + "-" + style
+fontname = fontname + additionalFontNameSuffix.replace(" ", "")
 
 # let us try to get the 'style' from the font info in sfnt_names and fallback to the
 # parse fontname if it fails: