From cb84108b0ed06c2193809ebb70832350572fea0a Mon Sep 17 00:00:00 2001
From: Miles Bader <miles@gnu.org>
Date: Sat, 28 Feb 2004 22:45:01 +0000
Subject: [PATCH] Resolve CVS conflicts

---
 lisp/thumbs.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index d7d8a0f58b2..cc692c1f975 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -734,3 +734,4 @@ ACTION and ARG should be legal convert command."
 ;;; thumbs.el ends here
 
 
+;;; arch-tag: f9ac1ef8-83fc-42c0-8069-1fae43fd2e5c
-- 
2.39.2