From f8fd8e03776a72a2bc21ba67c5537023273c17f4 Mon Sep 17 00:00:00 2001
From: nvazquez <nicovazquez90@gmail.com>
Date: Thu, 3 Oct 2024 11:42:01 -0300
Subject: [PATCH] Fix after rebasing

---
 ui/src/components/view/InfoCard.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index 1c540d60c1d..b7bbc896c07 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -544,7 +544,6 @@
             <span v-else>{{ resource.serviceofferingname || resource.serviceofferingid }}</span>
           </div>
         </div>
-<<<<<<< HEAD
         <div class="resource-detail-item" v-if="resource.controlofferingname && resource.controlofferingid">
           <div class="resource-detail-item__label">{{ $t('label.service.offering.controlnodes') }}</div>
           <div class="resource-detail-item__details">