fix merge issue 34/5934/1
authorMike Marchetti <mmarchetti@sandvine.com>
Wed, 4 Apr 2018 14:05:42 +0000 (10:05 -0400)
committerMike Marchetti <mmarchetti@sandvine.com>
Wed, 4 Apr 2018 14:05:42 +0000 (10:05 -0400)
commit5a470344853c99a5bb291d22558cb917fdd88e3b
treecc0b6e25a4aa8a782f490b43107f835c656c5427
parent4a98a04ff0ceb544ca7f5f9033d5633dea7ab092
fix merge issue

Change-Id: Ia31df08f51c7b20cb8ecfaf61b9ab6904ddd4f16
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>
installers/install_osm.sh
installers/nat_osm