From e7ea3be4bce909099be8df1c1c9e0ac8d6751070 Mon Sep 17 00:00:00 2001
From: idafurjes <36131195+idafurjes@users.noreply.github.com>
Date: Thu, 3 Mar 2022 14:13:26 +0100
Subject: [PATCH] Resolve merge conflict lint error (#46162)

---
 pkg/services/provisioning/plugins/plugin_provisioner_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/services/provisioning/plugins/plugin_provisioner_test.go b/pkg/services/provisioning/plugins/plugin_provisioner_test.go
index 99042ba7fa3..f8072393c5c 100644
--- 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
+}