diff options
| author | Kenichi Handa <handa@etlken> | 2010-07-14 12:53:53 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@etlken> | 2010-07-14 12:53:53 +0900 |
| commit | ebd3d6afa42948e3fb136583f12f9f72e7830ec5 (patch) | |
| tree | 5294a6d78466de1543250d2249920fb1c86376bb /src | |
| parent | 73a4405a3539be595a6360c9e207d6ee2995a0c4 (diff) | |
Fix previous conflict.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7493132858..923ba3afaf 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 <[email protected]> |