Update TODO list.

diff --git a/doc/TODO b/doc/TODO
index 6e3efe93154b1c1c664f8950f94fad170ff51058..4fe5f7107a6a93c1ae108e365bf22b3ca031bb6e 100644 (file)
--- 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)