diff options
| author | Eli Zaretskii | 2014-12-08 19:10:38 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2014-12-08 19:10:38 +0200 |
| commit | 2354db7f53c25cfdac1b9436bbc56a54f16253f0 (patch) | |
| tree | f26f002d2c4732fdf69fe6c88c22c9c5bb2860f0 /ChangeLog | |
| parent | 5872f843ff45de150f4b35cbc9b11e9f63c96cf2 (diff) | |
| download | emacs-2354db7f53c25cfdac1b9436bbc56a54f16253f0.tar.gz emacs-2354db7f53c25cfdac1b9436bbc56a54f16253f0.zip | |
Fix merge glitches in 2 ChangeLog files.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
| @@ -19,7 +19,6 @@ | |||
| 19 | * .gitignore: Remove redundant pattern (subsumed by _*). | 19 | * .gitignore: Remove redundant pattern (subsumed by _*). |
| 20 | Avoid "**", as it requires Git 1.8.2 or later. | 20 | Avoid "**", as it requires Git 1.8.2 or later. |
| 21 | 21 | ||
| 22 | 2014-12-05 Paul Eggert <eggert@cs.ucla.edu> | ||
| 23 | 2014-12-05 Eli Zaretskii <eliz@gnu.org> | 22 | 2014-12-05 Eli Zaretskii <eliz@gnu.org> |
| 24 | 23 | ||
| 25 | * .gitignore: Ignore test/biditest.txt. | 24 | * .gitignore: Ignore test/biditest.txt. |