1 files changed, 1 insertions, 5 deletions
diff --git a/doc/TODO b/doc/TODO
index ff2ab910f7e..508ce5553b2 100644
--- 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)