Merge tag 'snapshot-start' into stable

[gnulib.git] / doc / maintain.texi

diff --git a/doc/maintain.texi b/doc/maintain.texi
index 68cc635..496e920 100644 (file)
--- a/doc/maintain.texi
+++ b/doc/maintain.texi
@@ -5,7 +5,11 @@
 @c For double-sided printing, uncomment:
 @c @setchapternewpage odd
 @c This date is automagically updated when you save this file:
+<<<<<<< HEAD
+@set lastupdate December 2, 2011
+=======
 @set lastupdate March 20, 2012
+>>>>>>> snapshot-start
 @c %**end of header
 
 @dircategory GNU organization