From 39bc93446daec9ae0911b58f6c52d8b7adeee717 Mon Sep 17 00:00:00 2001
From: Wes Carroll <wcarroll@oceanbeachlife.com>
Date: Thu, 21 Feb 2019 12:52:52 -0500
Subject: [PATCH] Revert "Update Install-ZertoVra.ps1"

This reverts commit 8285705cf375a9c1360bfef356a19801a3e32866, reversing
changes made to 087c2d74111b23844b7816cc2280d2d6d367b832.
---
 ZertoApiWrapper/Public/Install-ZertoVra.ps1 | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ZertoApiWrapper/Public/Install-ZertoVra.ps1 b/ZertoApiWrapper/Public/Install-ZertoVra.ps1
index 8b94203..4079f7e 100644
--- a/ZertoApiWrapper/Public/Install-ZertoVra.ps1
+++ b/ZertoApiWrapper/Public/Install-ZertoVra.ps1
@@ -27,13 +27,8 @@ function Install-ZertoVra {
     )
     #TODO - Test to see if VRA already exists!
     $vraName = "Z-VRA-{0}" -f $hostName
-<<<<<<< HEAD
-    if ( -not (Get-ZertoVra -vraName $vraName) ) {
+    if ( Get-ZertoVra -vraName $vraName ) {
         $siteIdentifier = $script:zertoLocalInfo.SiteIdentifier
-=======
-    if ( -not (Get-ZertoVra -vraName $vraName) ) {
-        $siteIdentifier = $script:zertoLocalInfo.SiteIdentifier
->>>>>>> master
         $hostIdentifier = Get-ZertoVirtualizationSite -siteIdentifier $siteIdentifier -hosts | Where-Object {$_.VirtualizationHostName -eq $hostName} | Select-Object hostIdentifier -ExpandProperty hostIdentifier
         $networkIdentifier = Get-ZertoVirtualizationSite -siteIdentifier $siteIdentifier -networks | Where-Object {$_.VirtualizationNetworkName -eq $networkName} | Select-Object NetworkIdentifier -ExpandProperty NetworkIdentifier
         $datastoreIdentifier = Get-ZertoVirtualizationSite -siteIdentifier $siteIdentifier -datastores | Where-Object {$_.DatastoreName -eq $datastoreName} | Select-Object DatastoreIdentifier -ExpandProperty DatastoreIdentifier