diff --git a/NEWS b/NEWS index 65790c7d..ed756d42 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,6 @@
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