1 files changed, 1 insertions, 5 deletions
diff --git a/doc/TODO b/doc/TODO
index 6e3efe93154..4fe5f7107a6 100644
--- 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)