From 63e226ae9eec6ca3cdaa5bfdc530d51121594a93 Mon Sep 17 00:00:00 2001
From: sabetts <sabetts>
Date: Mon, 12 Mar 2001 01:10:48 +0000
Subject: merged rel-0-1-0 branch

---
 NEWS | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index 5f17261..849183a 100644
--- a/NEWS
+++ b/NEWS
@@ -101,11 +101,7 @@ All fixed length buffer sizes in window names that resulted in
 curious segfaults have been fixed.
 
 ** Themes support
-<<<<<<< NEWS
 There is still no theme support, despite what you might have heard.
-=======
-There is still no themes support, despite what you might have heard.
->>>>>>> 1.13.2.2
 
 
 * Changes Singe 0.0.4
-- 
cgit v1.2.3