From 4789956dcac5961c02ca2399acb7bde8a3f8df99 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Thu, 21 Dec 2023 17:16:27 +0100
Subject: nat66: T2898: build fix after ndp-proxy backport

---
 src/conf_mode/nat66.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/conf_mode/nat66.py b/src/conf_mode/nat66.py
index 393be998f..990d6132e 100755
--- 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
 
-- 
cgit v1.2.3