From bc900789b590248058ae4792c581dcbd66670df8 Mon Sep 17 00:00:00 2001 From: Nicolas Vazquez Date: Wed, 1 Feb 2023 08:27:37 -0300 Subject: [PATCH] ui: Fix UI not loading after merge conflict issue (#7156) --- ui/public/locales/en.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index 0725cb60577..067c1202b23 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -668,15 +668,12 @@ "label.duration.7days": "7 days", "label.dynamicscalingenabled": "Dynamic scaling enabled", "label.dynamicscalingenabled.tooltip": "VM can dynamically scale only when dynamic scaling is enabled on template, service offering and global setting.", -<<<<<<< HEAD "label.diskofferingstrictness": "Disk offering strictness", "label.disksizestrictness": "Disk size strictness", "label.computeonly.offering": "Compute only disk offering", "label.computeonly.offering.tooltip": "Option to specify root disk related information in the compute offering or to directly link a disk offering to the compute offering", "label.edge": "Edge", "label.edge.zone": "Edge Zone", -======= ->>>>>>> main "label.edit": "Edit", "label.edit.acl.list": "Edit ACL list", "label.edit.acl.rule": "Edit ACL rule",