Resolve conflicts

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
harvester · Sep 27, 2024 · 80119e3 · 80119e3
1 parent 6eecd47
commit 80119e3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pkg/harvester/config/labels-annotations.js b/pkg/harvester/config/labels-annotations.js
@@ -51,11 +51,7 @@ export const HCI = {
   PARENT_SRIOV_GPU:               'harvesterhci.io/parentSRIOVGPUDevice',
   VM_MAINTENANCE_MODE_STRATEGY:   'harvesterhci.io/maintain-mode-strategy',
   NODE_CPU_MANAGER_UPDATE_STATUS: 'harvesterhci.io/cpu-manager-update-status',
-<<<<<<< HEAD
-  CPU_MANAGER:                    'cpumanager'
-=======
   CPU_MANAGER:                    'cpumanager',
   VM_DEVICE_ALLOCATION_DETAILS:   'harvesterhci.io/deviceAllocationDetails',
   SVM_BACKUP_ID:                  'harvesterhci.io/svmbackupId',
->>>>>>> eabd94355 (fix Restore New / Restore Existing action route)
 };