fix merge conflict

Pearl Dsilva · Pearl Dsilva · commit 9e317842b826 · 2026-04-27T08:06:14.000-04:00
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
@@ -426,8 +426,4 @@ public Boolean vmActivityCheck(HAStoragePool pool, HostTO host, Duration activit
             return true;
         }
     }
-
-    public void setType(StoragePoolType type) {
-        this.type = type;
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -426,8 +426,4 @@ public Boolean vmActivityCheck(HAStoragePool pool, HostTO host, Duration activit`
`426`	`426`	`return true;`
`427`	`427`	`}`
`428`	`428`	`}`
`429`		`-`
`430`		`- public void setType(StoragePoolType type) {`
`431`		`- this.type = type;`
`432`		`- }`
`433`	`429`	`}`