Fix merge conflicts from 3.4

This commit is contained in:
Lipu Fei 2018-06-05 09:02:52 +02:00
commit 7f7a195627
13 changed files with 187 additions and 31 deletions

View file

@ -199,7 +199,6 @@ class CuraApplication(QtApplication):
self._platform_activity = False
self._scene_bounding_box = AxisAlignedBox.Null
self._job_name = None
self._center_after_select = False
self._camera_animation = None
self._cura_actions = None