Resolve conflicts.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ee96a6..e3afe7c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * shr.el (shr-table-horizontal-line): Change the defaults for the table
+       lines to be spaces instead.
+
 2011-03-07  Julien Danjou  <julien@danjou.info>
 
        * sieve-manage.el (sieve-sasl-auth): Create auth-info if not found.