From 267535d9c72267771c2ae561bf8f9c37b277d0cc Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 3 Oct 2008 23:21:43 +0000
Subject: [PATCH] Remove <<<<<<< from NEWS

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

diff --git a/NEWS b/NEWS
index 65790c7d..ed756d42 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,6 @@
 <pre>
 2008-XX-XX:
     * version 2.0 (probably)
-<<<<<<< NEWS
     * IMPORTANT: 'verbose' is now used for message levels. Logging is
       controlled by the extensions.liberator.loglevel preference.
     * IMPORTANT: :viusage and :exusage now jump to the help index, use the