IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-09 07:33:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Ryan McKinley 2024-07-03 20:25:12 -07:00
parent aa4901e206
commit ab591cf4d1
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/tests/apis/peakq/peakq_test.go
View File

@ -2,10 +2,6 @@ package playlist
import (
"encoding/json"
<<<<<<< HEAD
"fmt"
=======
>>>>>>> origin/resource-store-bridge
"testing"
"github.com/stretchr/testify/require"
@ -38,11 +34,7 @@ func TestIntegrationFoldersApp(t *testing.T) {
v1Disco, err := json.MarshalIndent(resources, "", " ")
require.NoError(t, err)
<<<<<<< HEAD
fmt.Printf("%s", string(v1Disco))
=======
//fmt.Printf("%s", string(v1Disco))
>>>>>>> origin/resource-store-bridge
require.JSONEq(t, `{
"kind": "APIResourceList",
"apiVersion": "v1",