diff options
| author | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-19 13:37:05 +0200 |
|---|---|---|
| committer | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-19 13:37:05 +0200 |
| commit | 2fce29055b7b5bc2860d503d1ae822931f80b7aa (patch) | |
| tree | 8895e66bb6551f6d5f037db041fa15b98daa4ebc | |
| parent | 365e71f706b40c32173fa06c6feaac48c1527520 (diff) | |
| download | vyos-strongswan-2fce29055b7b5bc2860d503d1ae822931f80b7aa.tar.gz vyos-strongswan-2fce29055b7b5bc2860d503d1ae822931f80b7aa.zip | |
Remove merge conflict markers
| -rw-r--r-- | NEWS | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= strongswan-4.5.1 ---------------- @@ -74,7 +72,6 @@ strongswan-4.5.1 - The revocation and x509 libstrongswan plugins and the pki tool gained basic support for delta CRLs. ->>>>>>> upstream/4.5.1 strongswan-4.5.0 ---------------- |