From 9e317842b826ef18afdfa4e5c1ea220dbb8fd648 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Mon, 27 Apr 2026 08:06:14 -0400 Subject: [PATCH] fix merge conflict --- .../com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java | 4 ---- 1 file changed, 4 deletions(-) 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 index 1cfff09022b..bf52f7cd418 100644 --- 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 class LibvirtStoragePool implements KVMStoragePool { return true; } } - - public void setType(StoragePoolType type) { - this.type = type; - } }