# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1078008301 0
# Node ID 318542a275c40565f57af5f4f46fdf9f37aad708
# Parent  20bee085cbee67dd110822ac0d924e142d6d3bc7
Resolve CVS conflicts

diff -r 20bee085cbee -r 318542a275c4 lisp/thumbs.el
--- a/lisp/thumbs.el	Sat Feb 28 22:22:38 2004 +0000
+++ b/lisp/thumbs.el	Sat Feb 28 22:45:01 2004 +0000
@@ -734,3 +734,4 @@
 ;;; thumbs.el ends here
 
 
+;;; arch-tag: f9ac1ef8-83fc-42c0-8069-1fae43fd2e5c