From: Glenn Morris Date: Thu, 23 Sep 2010 06:48:13 +0000 (-0700) Subject: Remove timestamp and related local variables from table.el. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~42^2~85 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=45a3f5c644f510afe8328c11f0c73fd298a2fd81;p=emacs.git Remove timestamp and related local variables from table.el. It just causes unnecessary merge conflicts. --- diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 4a587e1019c..136c5dc466c 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -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 @@ It returns COLUMN unless STR contains some wide characters." (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