From 2fce29055b7b5bc2860d503d1ae822931f80b7aa Mon Sep 17 00:00:00 2001 From: René Mayrhofer Date: Thu, 19 May 2011 13:37:05 +0200 Subject: Remove merge conflict markers --- NEWS | 3 --- 1 file changed, 3 deletions(-) diff --git a/NEWS b/NEWS index 7a2ac1aad..42af2d37f 100644 --- a/NEWS +++ b/NEWS @@ -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 ---------------- -- cgit v1.2.3