diff options
Diffstat (limited to 'man/ipsec.secrets.5')
| -rw-r--r-- | man/ipsec.secrets.5 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/man/ipsec.secrets.5 b/man/ipsec.secrets.5 index cdefee24d..993b2ad10 100644 --- a/man/ipsec.secrets.5 +++ b/man/ipsec.secrets.5 @@ -1,8 +1,4 @@ -<<<<<<< HEAD -.TH IPSEC.SECRETS 5 "2010-05-30" "4.5.0rc2" "strongSwan" -======= -.TH IPSEC.SECRETS 5 "2010-05-30" "4.5.1" "strongSwan" ->>>>>>> upstream/4.5.1 +.TH IPSEC.SECRETS 5 "2010-05-30" "4.5.2" "strongSwan" .SH NAME ipsec.secrets \- secrets for IKE/IPsec authentication .SH DESCRIPTION |