From ab591cf4d1bdaa20e2d642dbaeaf58cbfb47c058 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 3 Jul 2024 20:25:12 -0700
Subject: [PATCH] cleanup

---
 pkg/tests/apis/peakq/peakq_test.go | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkg/tests/apis/peakq/peakq_test.go b/pkg/tests/apis/peakq/peakq_test.go
index 23c4adee3c2..cda9024231a 100644
--- a/pkg/tests/apis/peakq/peakq_test.go
+++ b/pkg/tests/apis/peakq/peakq_test.go
@@ -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",