etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix after rebasing

This commit is contained in:
nvazquez 2024-10-03 11:42:01 -03:00
parent 9a1b32e830
commit f8fd8e0377
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/src/components/view/InfoCard.vue
View File

@ -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">