changeset 53154:9780583a5871

Resolve CVS conflicts
author Miles Bader <miles@gnu.org>
date Mon, 24 Nov 2003 22:19:51 +0000
parents 95cc51c7ff64
children 384390a9b30f
files lisp/progmodes/grep.el
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
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