Signed-off-by: Guido Trotter <[email protected]> --- NEWS | 1 - 1 file changed, 1 deletion(-)
diff --git a/NEWS b/NEWS index b8ccc60..0f92648 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 -- 1.7.10.4
