Resolve merge conflict lint error (#46162)

4 years ago · e7ea3be4bc
parent e820275d06
commit e7ea3be4bc
1 changed files with 4 additions and 0 deletions
--- a/pkg/services/provisioning/plugins/plugin_provisioner_test.go
+++ b/pkg/services/provisioning/plugins/plugin_provisioner_test.go
@ -100,3 +100,7 @@ func (m *mockStore) UpdatePluginSetting(ctx context.Context, cmd *models.UpdateP
 func (m *mockStore) UpdatePluginSettingVersion(ctx context.Context, cmd *models.UpdatePluginSettingVersionCmd) error {
 	return nil
 }
+
+func (m *mockStore) GetPluginSettings(ctx context.Context, orgID int64) ([]*models.PluginSettingInfoDTO, error) {
+	return nil, nil
+}