Merge pull request #3 from global-vmware/dev

- Updated the listener_ip_address for US1-Isolated-Segment-02
global-vmware · Dec 12, 2023 · 4cac6f1 · 4cac6f1
2 parents e478b8e + b343c64
commit 4cac6f1
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/README.md b/README.md
@@ -63,11 +63,8 @@ module "vcd_nsxt_network_dhcp" {
       gateway             = "172.16.21.1"
       prefix_length       = 24
       dns_suffix          = "mydomain.com"
-<<<<<<< HEAD
-      listener_ip_address = null
-=======
+      listener_ip_address = "192.16.20.10"
       listener_ip_address = "172.16.21.10"
->>>>>>> 4360329dfcd3ef4394b0253b0cfc585141372531
       pool_ranges         = [
         {
           start_address = "172.16.21.101"
@@ -84,8 +81,4 @@ module "vcd_nsxt_network_dhcp" {
 
 ## Authors
 
-<<<<<<< HEAD
 This module is maintained by the [Global VMware Cloud Automation Services Team](https://github.com/global-vmware).
-=======
-This module is maintained by the [Global VMware Cloud Automation Services Team](https://github.com/global-vmware).
->>>>>>> 4360329dfcd3ef4394b0253b0cfc585141372531