X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fnat_osm;h=b7b70970f7f4dc0db8c0075dc1e769afd3cdca7e;hb=refs%2Fheads%2FWIM;hp=ab0e1e1cd9c9bfda6b4acef5886aacc24fbf366a;hpb=4a98a04ff0ceb544ca7f5f9033d5633dea7ab092;p=osm%2Fdevops.git

diff --git a/installers/nat_osm b/installers/nat_osm
index ab0e1e1c..b7b70970 100755
--- a/installers/nat_osm
+++ b/installers/nat_osm
@@ -88,13 +88,8 @@ done
 echo
 echo "*** Configuring iptables rules ***"
 
-<<<<<<< HEAD
-awk -v RO_IP="$RO_IP" -v VCA_IP="$VCA_IP" -v UI_IP="$UI_IP" -v openmano_ip="$RO_CONTAINER_IP" -v rift_ip="$SO_CONTAINER_IP" -v juju_ip="$VCA_CONTAINER_IP" '
-BEGIN {innat=0; innatpre=0; osmpre=0; donepre=0; innatpost=0; osmpost=0; donepost=0; innatoutput=0; osmoutput=0; doneoutput=0;}
-=======
 awk -v RO_IP="$RO_IP" -v VCA_IP="$VCA_IP" -v UI_IP="$UI_IP" -v openmano_ip="$RO_CONTAINER_IP" -v MON_IP="$MON_IP" -v rift_ip="$SO_CONTAINER_IP" -v juju_ip="$VCA_CONTAINER_IP" '
 BEGIN {innat=0; innatpre=0; osmpre=0; donepre=0; innatpost=0; osmpost=0; donepost=0}
->>>>>>> MON Installation Changes Updated.
 /^\*nat/ {
     innat=1;
     print;