diff options
Diffstat (limited to 'src/ipsec/ipsec.8')
| -rw-r--r-- | src/ipsec/ipsec.8 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/ipsec/ipsec.8 b/src/ipsec/ipsec.8 index d0bd9ce70..6f4117be7 100644 --- a/src/ipsec/ipsec.8 +++ b/src/ipsec/ipsec.8 @@ -1,8 +1,4 @@ -<<<<<<< HEAD -.TH IPSEC 8 "2010-05-30" "4.5.0rc1" "strongSwan" -======= .TH IPSEC 8 "2010-05-30" "4.5.1" "strongSwan" ->>>>>>> upstream/4.5.1 .SH NAME ipsec \- invoke IPsec utilities .SH SYNOPSIS |