kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: Fixed leftover from badly merged commit

Browse Source
This commit is contained in:
Yorik van Havre
2019-08-12 19:46:40 -03:00
parent a210ec3733
commit 537a011a1d
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Draft/importSVG.py
View File

@@ -743,15 +743,6 @@ class svgHandler(xml.sax.ContentHandler):
ret = msgBox.exec_() ret = msgBox.exec_()
if ret == QtGui.QMessageBox.Yes: if ret == QtGui.QMessageBox.Yes:
self.svgdpi = 96.0 self.svgdpi = 96.0
<<<<<<< HEAD
else:
self.svgdpi = 90.0
if ret:
FCC.PrintMessage(translate("ImportSVG", _msg) + "\n")
FCC.PrintMessage(translate("ImportSVG", _qst) + "\n")
FCC.PrintMessage("*** User specified "
+ str(self.svgdpi) + " dpi ***\n")
=======
if 'style' in data: if 'style' in data:
if not data['style']: if not data['style']:
pass#empty style attribute stops inheriting from parent pass#empty style attribute stops inheriting from parent
@@ -832,7 +823,6 @@ class svgHandler(xml.sax.ContentHandler):
self.grouptransform.append(m) self.grouptransform.append(m)
else: else:
self.transform = m self.transform = m
>>>>>>> 6d64c2b2c6bc64ce21e7c2f4ed7e1ab2c8991f8e
else: else:
self.svgdpi = 96.0 self.svgdpi = 96.0
FCC.PrintMessage(_msg + "\n") FCC.PrintMessage(_msg + "\n")