1 files changed, 5 insertions, 1 deletions

diff --git a/doc/TODO b/doc/TODO
index d9634d7d2de..ff2ab910f7e 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,6 +1,10 @@
 TODO list for PostgreSQL
 ========================
-Last updated:		Sun Sep 23 09:55:37 EDT 2001
+<<<<<<< TODO
+Last updated:		Sun Sep 23 10:01:15 EDT 2001
+=======
+Last updated:		Sun Sep 23 10:01:15 EDT 2001
+>>>>>>> 1.561
 
 Current maintainer:	Bruce Momjian (pgman@candle.pha.pa.us)