diff options
| author | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-03-05 09:29:19 +0100 |
|---|---|---|
| committer | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-03-05 09:29:19 +0100 |
| commit | 365e71f706b40c32173fa06c6feaac48c1527520 (patch) | |
| tree | 54fa72a914d18c9430eaa54f3de4a2d4419198af /man/ipsec.secrets.5 | |
| parent | 5d7669b7b3563c50b3c86903e0a49373d597b8a0 (diff) | |
| parent | 568905f488e63e28778f87ac0e38d845f45bae79 (diff) | |
| download | vyos-strongswan-365e71f706b40c32173fa06c6feaac48c1527520.tar.gz vyos-strongswan-365e71f706b40c32173fa06c6feaac48c1527520.zip | |
Fixed merge, don't know why this didn't happen automatically - maybe a leftover from the svn->git conversion
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 |