cleanup merge artifact

diff --git a/NEWS b/NEWS
index ae4db5bea5551ecfc47f2de9f8553d502ad909f8..d2cf132b402718783a7f2ae3f2a19eaec8268e49 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,5 @@
 * What's new
 
-<<<<<<< HEAD
 - It is now possible in some situations to use print_ubacktrace() to
   get a user space stack trace from a kernel probe point. e.g. for
   user backtraces when there is a pagefault: