summaryrefslogtreecommitdiff
path: root/NEWS
diff options
context:
space:
mode:
authorsabetts <sabetts>2001-03-12 01:10:48 +0000
committersabetts <sabetts>2001-03-12 01:10:48 +0000
commit63e226ae9eec6ca3cdaa5bfdc530d51121594a93 (patch)
tree8eacee028d2f7ae5143440c41e7cfcc3d239c247 /NEWS
parent0f1f9aa36796a34d01fb101c5ff5f0875104689e (diff)
downloadratpoison-63e226ae9eec6ca3cdaa5bfdc530d51121594a93.zip
merged rel-0-1-0 branch
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS4
1 files changed, 0 insertions, 4 deletions
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