From: Glenn Morris <rgm@gnu.org>
Date: Sun, 14 Oct 2012 00:17:07 +0000 (-0700)
Subject: ChangeLog fix
X-Git-Tag: emacs-24.2.90~235^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8336c6b3c5a971104437ca1939fae3ab998c486a;p=emacs.git

ChangeLog fix
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 6bb34d9866a..346fe0e86b3 100644
--- 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