From 738a803a756cfb0699b9e96efecd87cdddddf027 Mon Sep 17 00:00:00 2001 From: Guido Trotter <ultrotter@google.com> Date: Thu, 11 Apr 2013 17:32:31 -0400 Subject: [PATCH] Remove mistaken merge conflict line from NEWS Signed-off-by: Guido Trotter <ultrotter@google.com> Reviewed-by: Helga Velroyen <helgav@google.com> --- NEWS | 1 - 1 file changed, 1 deletion(-) diff --git a/NEWS b/NEWS index b8ccc6092..0f92648f5 100644 --- a/NEWS +++ b/NEWS @@ -68,7 +68,6 @@ Version 2.7.0 beta2 - Fix confd config load in case of ``--no-lvm-storage``. - The confd/query functionality is now mentioned in the security documentation. ->>>>>>> devel-2.7 Version 2.7.0 beta1 -- GitLab