fix merge conflict

Contributes to: CURA-8587

plugins/Marketplace/PackageList.py

@@ -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.

plugins/Marketplace/resources/qml/ManageButton.qml

@@ -17,6 +17,8 @@ RowLayout
     property string busySecondaryText: busyMessageText.text
     property string mainState: "primary"
 
+    signal clicked
+
     state: mainState
 
     Cura.PrimaryButton
@@ -26,6 +28,7 @@ RowLayout
 
         onClicked:
         {
+            manageButton.clicked()
             manageButton.state = "busy"
         }
     }
@@ -37,6 +40,7 @@ RowLayout
 
         onClicked:
         {
+            manageButton.clicked()
             manageButton.state = "busy"
         }
     }

plugins/Marketplace/resources/qml/Packages.qml

@@ -38,7 +38,6 @@ ListView
             text: section
             font: UM.Theme.getFont("large")
             color: UM.Theme.getColor("text")
-            onTextChanged: print(text)
         }
     }