X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Finstall_osm.sh;h=4cd797a114eb31e9cb658131e8a5f7efd02b76a5;hb=5a470344853c99a5bb291d22558cb917fdd88e3b;hp=7416dabfef0f299fb2e5a75b8e94c5763baffffd;hpb=4a98a04ff0ceb544ca7f5f9033d5633dea7ab092;p=osm%2Fdevops.git

diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index 7416dabf..4cd797a1 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -257,12 +257,8 @@ function configure_RO(){
     ro_is_up
 
     lxc exec RO -- openmano tenant-delete -f osm >/dev/null
-<<<<<<< HEAD
     lxc exec RO -- openmano tenant-create osm > /dev/null
-    lxc exec RO -- sed -i '/export OPENMANO_TENANT=osm/d' .bashrc 
-=======
     lxc exec RO -- sed -i '/export OPENMANO_TENANT=osm/d' .bashrc
->>>>>>> MON Installation Changes Updated.
     lxc exec RO -- sed -i '$ i export OPENMANO_TENANT=osm' .bashrc
     lxc exec RO -- sh -c 'echo "export OPENMANO_TENANT=osm" >> .bashrc'
 }