# HG changeset patch
# User Kenichi Handa <handa@etlken>
# Date 1279079633 -32400
# Node ID 64d1dc916ed8570ef422a8e81fba2af30e0e6fa0
# Parent  2bc66123f2c63c358f30b2b520ddaef3230934ee
Fix previous conflict.

diff -r 2bc66123f2c6 -r 64d1dc916ed8 src/ChangeLog
--- a/src/ChangeLog	Wed Jul 14 12:52:10 2010 +0900
+++ b/src/ChangeLog	Wed Jul 14 12:53:53 2010 +0900
@@ -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>