Merge from emacs--devo--0

[gnu-emacs] / admin / notes / trailing-whitespace

diff --git a/admin/notes/trailing-whitespace b/admin/notes/trailing-whitespace
index bbf5c05f173216042c8e6eb55fbca1742c6010dd..e29456b3a2f2ba57066542651a3c18a88adc0ec1 100644 (file)
--- a/admin/notes/trailing-whitespace
+++ b/admin/notes/trailing-whitespace
@@ -4,3 +4,5 @@ apparently there was a big discussion on emacs-devel wrt trailing whitespace.
 there was a mass-change to remove such from various branches in cvs.  probably
 it's a good idea to avoid adding trailing whitespace in new code/docs and in
 changes.
+
+;;; arch-tag: de441379-c345-4826-a784-352b5413a698