From d45b82b26cdef10115bc0a1e3a85ccfc3cd02d82 Mon Sep 17 00:00:00 2001
From: Paul Edwards <paul.m.edwards@gmail.com>
Date: Fri, 30 Apr 2021 15:20:47 +0100
Subject: [PATCH] forgot to save file in vscode

---
 tf/outputs.tf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tf/outputs.tf b/tf/outputs.tf
index caa5724ca..2770029bf 100644
--- 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"