From: Miles Bader <miles@gnu.org>
Date: Mon, 24 Nov 2003 22:19:51 +0000 (+0000)
Subject: Resolve CVS conflicts
X-Git-Tag: ttn-vms-21-2-B4~8279
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7239c2175617837111c501e5b28a687bd203c5e0;p=emacs.git

Resolve CVS conflicts
---

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index ea5fd421fe5..35a5780aa45 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -532,3 +532,4 @@ those sub directories of DIR."
 
 ;;; grep.el ends here
  
+;;; arch-tag: 5a5b9169-a79d-4f38-9c38-f69615f39c4d