diff options
| author | Kenichi Handa | 2010-07-14 12:53:53 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-07-14 12:53:53 +0900 |
| commit | ebd3d6afa42948e3fb136583f12f9f72e7830ec5 (patch) | |
| tree | 5294a6d78466de1543250d2249920fb1c86376bb /src/ChangeLog | |
| parent | 73a4405a3539be595a6360c9e207d6ee2995a0c4 (diff) | |
| download | emacs-ebd3d6afa42948e3fb136583f12f9f72e7830ec5.tar.gz emacs-ebd3d6afa42948e3fb136583f12f9f72e7830ec5.zip | |
Fix previous conflict.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 74931328585..923ba3afafd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | * process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef | 33 | * process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef |
| 34 | away the entire body of the function. | 34 | away the entire body of the function. |
| 35 | >>>>>>> MERGE-SOURCE | ||
| 36 | 35 | ||
| 37 | 2010-07-13 Dan Nicolaescu <dann@ics.uci.edu> | 36 | 2010-07-13 Dan Nicolaescu <dann@ics.uci.edu> |
| 38 | 37 | ||