aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-09-22 23:48:13 -0700
committerGlenn Morris2010-09-22 23:48:13 -0700
commit45a3f5c644f510afe8328c11f0c73fd298a2fd81 (patch)
treeed9fb6cab004a67d466fd888d6a6539ac40f9b43
parent1fc7dabfcfd30e4c987df5e0d31a2574e9a2cd1b (diff)
downloademacs-45a3f5c644f510afe8328c11f0c73fd298a2fd81.tar.gz
emacs-45a3f5c644f510afe8328c11f0c73fd298a2fd81.zip
Remove timestamp and related local variables from table.el.
It just causes unnecessary merge conflicts.
-rw-r--r--lisp/textmodes/table.el10
1 files changed, 0 insertions, 10 deletions
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 @@
6;; Keywords: wp, convenience 6;; Keywords: wp, convenience
7;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com> 7;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
8;; Created: Sat Jul 08 2000 13:28:45 (PST) 8;; Created: Sat Jul 08 2000 13:28:45 (PST)
9;; Revised: Tue Sep 21 2010 12:42:03 (PDT)
10 9
11;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
12 11
@@ -5590,14 +5589,5 @@ It returns COLUMN unless STR contains some wide characters."
5590 5589
5591(provide 'table) 5590(provide 'table)
5592 5591
5593;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
5594;; Local Variables: ***
5595;; time-stamp-line-limit: 16 ***
5596;; time-stamp-start: ";; Revised:[ \t]+" ***
5597;; time-stamp-end: "$" ***
5598;; time-stamp-format: "%3a %3b %02d %:y %02H:%02M:%02S (%Z)" ***
5599;; End: ***
5600;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
5601
5602;; arch-tag: 0d69b03e-aa5f-4e72-8806-5727217617e0 5592;; arch-tag: 0d69b03e-aa5f-4e72-8806-5727217617e0
5603;;; table.el ends here 5593;;; table.el ends here