From ebd3d6afa42948e3fb136583f12f9f72e7830ec5 Mon Sep 17 00:00:00 2001
From: Kenichi Handa <handa@etlken>
Date: Wed, 14 Jul 2010 12:53:53 +0900
Subject: [PATCH] Fix previous conflict.

---
 src/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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>