forgot to save file in vscode

Azure · Apr 30, 2021 · d45b82b · d45b82b
1 parent 2120240
commit d45b82b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tf/outputs.tf b/tf/outputs.tf
@@ -35,11 +35,7 @@ resource "local_file" "global_variables" {
       key_vault           = azurerm_key_vault.azhop.name
       sig_name            = azurerm_shared_image_gallery.sig.name
       lustre_hsm_storage_account = ( local.lustre_archive_account != null ? local.lustre_archive_account : azurerm_storage_account.azhop.name )
-<<<<<<< HEAD
       lustre_hsm_storage_container = ( local.lustre_archive_account != null ? local.configuration_yml["lustre"]["hsm"]["storage_container"] : azurerm_storage_container.lustre_archive[0].name )
-=======
-      lustre_hsm_storage_container = ( local.lustre_archive_account != null ? local.configuration_yml["lustre"]["hsm"]["storage_container"] : azurerm_storage_account.azhop.name )
->>>>>>> main
     }
   )
   filename = "${local.playbook_root_dir}/group_vars/all.yml"