# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1069712391 0
# Node ID 9780583a5871a6bf9be5c36186c6d07558ec0ebd
# Parent  95cc51c7ff6432dce270c13a0c9b80aeb47fe9a0
Resolve CVS conflicts

diff -r 95cc51c7ff64 -r 9780583a5871 lisp/progmodes/grep.el
--- a/lisp/progmodes/grep.el	Mon Nov 24 18:31:29 2003 +0000
+++ b/lisp/progmodes/grep.el	Mon Nov 24 22:19:51 2003 +0000
@@ -532,3 +532,4 @@
 
 ;;; grep.el ends here
  
+;;; arch-tag: 5a5b9169-a79d-4f38-9c38-f69615f39c4d