Commit ebd3d6af authored by Kenichi Handa's avatar Kenichi Handa
Browse files

Fix previous conflict.

parent 73a4405a
......@@ -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>
 
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment