From: Kenichi Handa <handa@etlken>
Date: Wed, 14 Jul 2010 03:53:53 +0000 (+0900)
Subject: Fix previous conflict.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~56
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ebd3d6afa42948e3fb136583f12f9f72e7830ec5;p=emacs.git

Fix previous conflict.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 74931328585..923ba3afafd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -32,7 +32,6 @@
 
 	* process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef
 	away the entire body of the function.
->>>>>>> MERGE-SOURCE
 
 2010-07-13  Dan Nicolaescu  <dann@ics.uci.edu>