Fix previous conflict.

ebd3d6af · Kenichi Handa · 73a4405a · ebd3d6af
Commit ebd3d6af authored Jul 14, 2010 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

src/ChangeLog src/ChangeLog +0 -1

No files found.
--- 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>