3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-11 00:37:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fixed silly merge conflict

Browse source
This commit is contained in:
Dimitriovski 2020-01-24 15:41:13 +01:00
commit 526cdac200
No known key found for this signature in database
GPG key ID: 4E62757E2B0D304D
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py
View file

@ -32,9 +32,8 @@ class DiscrepanciesPresenter(QObject):
# If there are incompatible packages - automatically dismiss them # If there are incompatible packages - automatically dismiss them
if model.getIncompatiblePackages(): if model.getIncompatiblePackages():
self._package_manager.dismissAllIncompatiblePackages(model.getIncompatiblePackages()) self._package_manager.dismissAllIncompatiblePackages(model.getIncompatiblePackages())
# For now, all compatible packages presented to the user should be installed. # For now, all compatible packages presented to the user should be installed.
# Later, we might remove items for which the user unselected the package # Later, we might remove items for which the user unselected the package
if model.getCompatiblePackages(): if model.getCompatiblePackages():
model.setItems(model.getCompatiblePackages()) model.setItems(model.getCompatiblePackages())
self.packageMutations.emit(model) # #### proveri sho e ova??? self.packageMutations.emit(model)