Update NEWS. A rare case where there are no merge errors but git gets it wrong.

2015-01-15 22:53:41 -05:00 · 2015-01-15 22:53:41 -05:00 · edefeb8ae0
parent 49cb05ac89
commit edefeb8ae0
1 changed files with 2 additions and 5 deletions
--- a/7
+++ b/7
@ -1,9 +1,4 @@
 DFHack Future
-    New Scripts
-        hotkey-notes:  print key, name, and jump position of hotkeys
-    Removed
-        needs_porting/*
-
    Internals
        EventManager: fixed crash error with EQUIPMENT_CHANGE event.
        key modifier state exposed to Lua
@ -12,8 +7,10 @@ DFHack Future
    New Plugins
        blueprint: export part of your fortress to quickfort .csv files
    New Scripts
+        hotkey-notes:  print key, name, and jump position of hotkeys
    Removed
        embark.lua
+        needs_porting/*
    New Tweaks
    Misc Improvements
        added support for searching more lists