summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2020-05-08 15:58:24 +0000
committerDave Barach <openvpp@barachs.net>2020-05-08 17:58:30 +0000
commit992109169038ade2755d50c20caa7cab8eb41449 (patch)
tree97de5a8a70e1361fd6f0f2734ce01fb8fcc6cbee /src/plugins
parenta5436ae2516edc955f26c6aa4103f5946ee8653c (diff)
docs: fix merge damage in nat.h
Type: fix Fixes: b5a575b09 Signed-off-by: Dave Wallace <dwallacelf@gmail.com> Change-Id: I22d35159a923075243df9760f1a74e2ca74e30e1
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/nat/nat.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/nat/nat.h b/src/plugins/nat/nat.h
index 7b57166a7e1..4a6631c463f 100644
--- a/src/plugins/nat/nat.h
+++ b/src/plugins/nat/nat.h
@@ -1261,7 +1261,6 @@ void nat_free_session_data (snat_main_t * sm, snat_session_t * s,
u32 thread_index, u8 is_ha);
/**
-<<<<<<< bdfe5955f59a735fd8d70e9026f8c1867a4c8cc6
* @brief Set NAT44 session limit (session limit, vrf id)
*
* @param session_limit Session limit
@@ -1271,10 +1270,7 @@ void nat_free_session_data (snat_main_t * sm, snat_session_t * s,
int nat44_set_session_limit (u32 session_limit, u32 vrf_id);
/**
- * @brief Free NAT44 ED session data (lookup keys, external addrres port)
-=======
* @brief Free NAT44 ED session data (lookup keys, external address port)
->>>>>>> docs: clean up make docs job
*
* @param s NAT session
* @param thread_index thread index