Fix previous conflict.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7493132..923ba3a 100644 (file)
--- 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>