Mercurial > emacs

changeset 109388:64d1dc916ed8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix previous conflict.
author Kenichi Handa <handa@etlken>
date Wed, 14 Jul 2010 12:53:53 +0900
parents 2bc66123f2c6
children b019ae044fb3 2bd8f25ebb95
files src/ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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>