Fix broken unit test

Signed-off-by: Grant Linville <[email protected]>
acorn-io · Dec 6, 2023 · 60fefdc · 60fefdc
1 parent dcafa98
commit 60fefdc
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/...ler/resolvedofferings/testdata/volumeclass/volume-class-defaults-same-gen/expected.golden b/...ler/resolvedofferings/testdata/volumeclass/volume-class-defaults-same-gen/expected.golden
@@ -30,22 +30,13 @@ status:
   appStatus: {}
   columns: {}
   conditions:
-<<<<<<< HEAD:pkg/controller/defaults/testdata/volumeclass/volume-class-defaults-same-gen/expected.golden
-    observedGeneration: 1
-    reason: Success
-    status: "True"
-    success: true
-    type: defaults
-  defaults: {}
-=======
   - error: true
     message: 'cannot resolve volume classes because two defaults volume classes exist:
       test-volume-class and test-volume-class-1'
     observedGeneration: 1
     reason: Error
     status: "False"
     type: resolved-offerings
->>>>>>> d06e0189c (Refactor defaults to resolvedOfferings):pkg/controller/resolvedofferings/testdata/volumeclass/volume-class-defaults-same-gen/expected.golden
   namespace: app-created-namespace
   observedGeneration: 1
   resolvedOfferings: {}