Update TODO list.

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