ChangeLog fix

diff --git a/src/ChangeLog b/src/ChangeLog
index 6bb34d9866aa03f43f750b74550947c71732695c..346fe0e86b30fd9b3f050ce1e6a88d79a934bd70 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1294,7 +1294,6 @@
        * sysdep.c (init_signals): Do not use SA_NODEFER.  It wasn't
        wanted even on POSIXish hosts, and it doesn't work on Windows.
 
->>>>>>> MERGE-SOURCE
 2012-09-23  Jan Djärv  <jan.h.d@swipnet.se>
 
        * xterm.c (x_term_init): Call fixup_locale before and after calling