Commit 738a803a authored by Guido Trotter's avatar Guido Trotter

Remove mistaken merge conflict line from NEWS

Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parent 723ec678
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment