From edefeb8ae01bd4fa6249d2b4ea446ae43e5cc99c Mon Sep 17 00:00:00 2001
From: expwnent <dfexpwnent+github@gmail.com>
Date: Thu, 15 Jan 2015 22:53:41 -0500
Subject: [PATCH] Update NEWS. A rare case where there are no merge errors but
 git gets it wrong.

---
 NEWS | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index eeb05eb63..2ea15e5c8 100644
--- a/NEWS
+++ b/NEWS
@@ -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