diff options
Diffstat (limited to 'man/ipsec.secrets.5')
| -rw-r--r-- | man/ipsec.secrets.5 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/man/ipsec.secrets.5 b/man/ipsec.secrets.5 index 1e586a491..cdefee24d 100644 --- a/man/ipsec.secrets.5 +++ b/man/ipsec.secrets.5 @@ -1,4 +1,8 @@ +<<<<<<< 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 .SH NAME ipsec.secrets \- secrets for IKE/IPsec authentication .SH DESCRIPTION |