diff lisp/progmodes/grep.el @ 53154:9780583a5871

Resolve CVS conflicts
author Miles Bader <miles@gnu.org>
date Mon, 24 Nov 2003 22:19:51 +0000
parents a0151f86f01e
children 23376885b0f9
line wrap: on
line diff
--- 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