[gnus git] branch master updated: m0-3-18-g89bbbce =1= Fix merge.

       via  89bbbce88d291218ce70304e11872fad0e189612 (commit)
      from  dbe766e74ab0e0764730d3560b372e3d14b6393c (commit)


- Log -----------------------------------------------------------------
commit 89bbbce88d291218ce70304e11872fad0e189612
Author: Lars Ingebrigtsen <[email protected]>
Date:   Sat Feb 18 14:14:59 2012 +0100

    Fix merge.

diff --git a/lisp/shr.el b/lisp/shr.el
index bdb2f4e..954e974 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -613,13 +613,9 @@ size, and full-buffer size."
 	image)
     (insert alt)))
 
-<<<<<<< HEAD
 (defun shr-rescale-image (data &optional force)
   "Rescale DATA, if too big, to fit the current buffer.
 If FORCE, rescale the image anyway."
-=======
-(defun shr-rescale-image (data)
->>>>>>> origin/no-gnus
   (let ((image (create-image data nil t :ascent 100)))
     (if (or (not (fboundp 'imagemagick-types))
 	    (not (get-buffer-window (current-buffer))))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/shr.el |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project