# HG changeset patch # User Glenn Morris # Date 1285224493 25200 # Node ID 367ffd53c0bd2b29ef5f8426878b8cf4a84770fb # Parent 7c4da622f1819910c35f8e1cb075f2bbb0633c42 Remove timestamp and related local variables from table.el. It just causes unnecessary merge conflicts. diff -r 7c4da622f181 -r 367ffd53c0bd lisp/textmodes/table.el --- a/lisp/textmodes/table.el Wed Sep 22 23:42:45 2010 -0700 +++ b/lisp/textmodes/table.el Wed Sep 22 23:48:13 2010 -0700 @@ -6,7 +6,6 @@ ;; Keywords: wp, convenience ;; Author: Takaaki Ota ;; Created: Sat Jul 08 2000 13:28:45 (PST) -;; Revised: Tue Sep 21 2010 12:42:03 (PDT) ;; This file is part of GNU Emacs. @@ -5590,14 +5589,5 @@ (provide 'table) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Local Variables: *** -;; time-stamp-line-limit: 16 *** -;; time-stamp-start: ";; Revised:[ \t]+" *** -;; time-stamp-end: "$" *** -;; time-stamp-format: "%3a %3b %02d %:y %02H:%02M:%02S (%Z)" *** -;; End: *** -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;; arch-tag: 0d69b03e-aa5f-4e72-8806-5727217617e0 ;;; table.el ends here