summaryrefslogtreecommitdiff
path: root/lisp/thumbs.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2004-02-28 22:45:01 +0000
committerMiles Bader <miles@gnu.org>2004-02-28 22:45:01 +0000
commitcb84108b0ed06c2193809ebb70832350572fea0a (patch)
tree6f893bfccde1c77a34746af8754927848d4241a5 /lisp/thumbs.el
parent4e7d32748f8c7f82d55b697edee781e8a8169f36 (diff)
downloademacs-cb84108b0ed06c2193809ebb70832350572fea0a.tar.gz
Resolve CVS conflicts
Diffstat (limited to 'lisp/thumbs.el')
-rw-r--r--lisp/thumbs.el1
1 files changed, 1 insertions, 0 deletions
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