From 09ef623ec93e2097de0d2faa90f5ed0d7c593f44 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Thu, 8 Jul 2010 17:14:38 -0400
Subject: [PATCH] cleanup merge artifact

---
 NEWS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/NEWS b/NEWS
index ae4db5bea..d2cf132b4 100644
--- 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:
-- 
2.43.5