fix bad rebase

observIQ · Feb 10, 2025 · 53ee211 · 53ee211
1 parent 904b7a9
commit 53ee211
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/internal/resource/resource_test.go b/internal/resource/resource_test.go
@@ -117,15 +117,7 @@ func TestAnyResourceV1(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-<<<<<<< HEAD
-<<<<<<< HEAD
 			_, err := AnyResourceV1(tc.id, tc.rName, tc.rType, tc.rkind, tc.rParameters, tc.rProcessors)
-=======
-			_, err := AnyResourceV1("", tc.rName, tc.rType, tc.rkind, tc.rParameters, tc.rProcessors)
->>>>>>> 1ba78bc (Generate component ID)
-=======
-			_, err := AnyResourceV1(tc.id, tc.rName, tc.rType, tc.rkind, tc.rParameters, tc.rProcessors)
->>>>>>> c5cc224 (test id change)
 			if tc.expectErr != "" {
 				require.Error(t, err)
 				require.ErrorContains(t, err, tc.expectErr)