Commit 2354db7f authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix merge glitches in 2 ChangeLog files.

parent 5872f843
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
* .gitignore: Remove redundant pattern (subsumed by _*). * .gitignore: Remove redundant pattern (subsumed by _*).
Avoid "**", as it requires Git 1.8.2 or later. Avoid "**", as it requires Git 1.8.2 or later.
2014-12-05 Paul Eggert <eggert@cs.ucla.edu>
2014-12-05 Eli Zaretskii <eliz@gnu.org> 2014-12-05 Eli Zaretskii <eliz@gnu.org>
* .gitignore: Ignore test/biditest.txt. * .gitignore: Ignore test/biditest.txt.
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
* nsfns.m (ns_set_name_as_filename): Don't set represented filename * nsfns.m (ns_set_name_as_filename): Don't set represented filename
at once, call ns_set_represented_filename instead. at once, call ns_set_represented_filename instead.
   
2014-12-05 Eli Zaretskii <eliz@gnu.org>
2014-12-05 Eli Zaretskii <eliz@gnu.org> 2014-12-05 Eli Zaretskii <eliz@gnu.org>
   
* dispextern.h (enum bidi_dir_t): Force NEUTRAL_DIR to be zero. * dispextern.h (enum bidi_dir_t): Force NEUTRAL_DIR to be zero.
......
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