nat66: T2898: build fix after ndp-proxy backport

vyos · Dec 21, 2023 · 4789956 · 4789956
1 parent eac5251
commit 4789956
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/src/conf_mode/nat66.py b/src/conf_mode/nat66.py
@@ -147,17 +147,6 @@ def apply(nat):
         return None
 
     cmd(f'nft -f {nftables_nat66_config}')
-<<<<<<< HEAD
-
-    if 'deleted' in nat or not dict_search('source.rule', nat):
-        cmd('systemctl stop ndppd')
-        if os.path.isfile(ndppd_config):
-            os.unlink(ndppd_config)
-    else:
-        cmd('systemctl restart ndppd')
-=======
-    call_dependents()
->>>>>>> 4d721a580 (T2898: add ndp-proxy service)
 
     return None