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

fix merge conflict

Browse source 
Contributes to: CURA-8587
This commit is contained in:
Jelle Spijker 2021-12-01 18:32:14 +01:00
parent c1cffa09fe
commit 327b434788
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/Marketplace/PackageList.py
View file

@ -7,7 +7,8 @@ from typing import Optional, TYPE_CHECKING
from UM.i18n import i18nCatalog
from UM.Qt.ListModel import ListModel
from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope # To request JSON responses from the API.
from UM.TaskManagement.HttpRequestManager import HttpRequestData # To request the package list from the API.
from UM.TaskManagement.HttpRequestManager import HttpRequestData # To request the package list from the API
from UM.Logger import Logger
from cura.CuraApplication import CuraApplication
from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope # To make requests to the Ultimaker API with correct authorization.