Update TODO list.

25 years ago · 60261de80b
parent 331d940fe9
commit 60261de80b
1 changed files with 1 additions and 5 deletions
--- a/doc/TODO
+++ b/doc/TODO
@ -1,10 +1,6 @@
 TODO list for PostgreSQL
 ========================
-<<<<<<< TODO
-Last updated:		Tue Feb 13 15:53:36 EST 2001
-=======
-Last updated:		Tue Feb 13 15:53:36 EST 2001
->>>>>>> 1.378
+Last updated:		Tue Feb 13 15:54:29 EST 2001

 Current maintainer:	Bruce Momjian (pgman@candle.pha.pa.us)