summaryrefslogtreecommitdiff
path: root/src/conf_mode/protocols_pim.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/conf_mode/protocols_pim.py')
-rwxr-xr-xsrc/conf_mode/protocols_pim.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/conf_mode/protocols_pim.py b/src/conf_mode/protocols_pim.py
index 0e22d3a6b..9b74fe992 100755
--- a/src/conf_mode/protocols_pim.py
+++ b/src/conf_mode/protocols_pim.py
@@ -132,11 +132,7 @@ def apply(pim):
return None
if os.path.exists(config_file):
-<<<<<<< HEAD
- os.system("vtysh -d pimd -f " + config_file)
-=======
- run("sudo vtysh -d pimd -f " + config_file)
->>>>>>> util: T2226: covert most calls from os.system to util
+ run("vtysh -d pimd -f " + config_file)
os.remove(config_file)
return None