3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-28 21:31:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix a merge error

Browse source
This commit is contained in:
Arjen Hiemstra 2015-08-21 18:28:53 +02:00
parent f099c30dfd
commit 9888a6eb42
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/CuraApplication.py
View file

@ -38,11 +38,7 @@ from . import PrintInformation
from . import CuraActions from . import CuraActions
from . import MultiMaterialDecorator from . import MultiMaterialDecorator
<<<<<<< HEAD from PyQt5.QtCore import pyqtSlot, QUrl, Qt, pyqtSignal, pyqtProperty, QEvent, Q_ENUMS
from PyQt5.QtCore import pyqtSlot, QUrl, Qt, pyqtSignal, pyqtProperty, Q_ENUMS
=======
from PyQt5.QtCore import pyqtSlot, QUrl, Qt, pyqtSignal, pyqtProperty, QEvent
>>>>>>> 3cb3cce31c821a56d2395607a90b51030fdf0916
from PyQt5.QtGui import QColor, QIcon from PyQt5.QtGui import QColor, QIcon
import platform import platform