From: Dave Wallace <dwallacelf@gmail.com>
Date: Fri, 8 May 2020 15:58:24 +0000 (+0000)
Subject: docs: fix merge damage in nat.h
X-Git-Tag: v20.09-rc0~25
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F58%2F26958%2F3;p=vpp.git

docs: fix merge damage in nat.h

Type: fix
Fixes: b5a575b09

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I22d35159a923075243df9760f1a74e2ca74e30e1
---

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